Remove constraints option and check every options

twbs · Apr 14, 2017 · d857f86 · d857f86
1 parent 56d42a7
commit d857f86
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git 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
@@ -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
+            }
           }
         })