aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2017-04-14 12:05:54 +0200
committerJohann-S <[email protected]>2017-05-14 11:41:19 +0200
commitc21a2b0d92ca78b63bb9ec21ca0fbf9e9206a18e (patch)
treea8f06132f88c6a81eaa9c60dc6847a15086031f0
parent54a8ab40111dacdf50fad22e6f36d2801ba653c9 (diff)
downloadbootstrap-c21a2b0d92ca78b63bb9ec21ca0fbf9e9206a18e.tar.xz
bootstrap-c21a2b0d92ca78b63bb9ec21ca0fbf9e9206a18e.zip
Remove constraints option and check every options
-rw-r--r--js/src/dropdown.js14
-rw-r--r--js/src/tooltip.js12
2 files changed, 12 insertions, 14 deletions
diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index a2b5561c2..ad5ee8d9f 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -63,17 +63,13 @@ const Dropdown = (($) => {
}
const Default = {
- animation : true,
- trigger : 'click',
placement : 'bottom',
- offset : '0 0'
+ offset : {}
}
const DefaultType = {
- animation : 'boolean',
- trigger : 'string',
placement : 'string',
- offset : 'string'
+ offset : 'number'
}
@@ -145,8 +141,10 @@ const Dropdown = (($) => {
this._popper = new Popper(this, context._menu, {
placement : context._config.placement,
- offsets : {
- popper : context._config.offset
+ modifiers : {
+ offset : {
+ offset : this.config.offset
+ }
}
})
diff --git a/js/src/tooltip.js b/js/src/tooltip.js
index 2c22a7ed4..5f5e3d7bc 100644
--- a/js/src/tooltip.js
+++ b/js/src/tooltip.js
@@ -47,8 +47,7 @@ const Tooltip = (($) => {
html : false,
selector : false,
placement : 'top',
- offset : '0 0',
- constraints : [],
+ offset : {},
container : false
}
@@ -61,8 +60,7 @@ const Tooltip = (($) => {
html : 'boolean',
selector : '(string|boolean)',
placement : '(string|function)',
- offset : 'string',
- constraints : 'array',
+ offset : 'number',
container : '(string|element|boolean)'
}
@@ -285,8 +283,10 @@ const Tooltip = (($) => {
this._popper = new Popper(this.element, tip, {
placement : attachment,
- offsets : {
- popper : this.config.offset
+ modifiers : {
+ offset : {
+ offset : this.config.offset
+ }
}
})