From d857f86549e10b36c13c012a35f57bdf37b5372d Mon Sep 17 00:00:00 2001 From: Johann-S Date: Fri, 14 Apr 2017 12:05:54 +0200 Subject: [PATCH] Remove constraints option and check every options --- js/src/dropdown.js | 14 ++++++-------- js/src/tooltip.js | 12 ++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 62a4bc9146d9..777d45f7c396 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 8d80142b0657..6205b7d182f3 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 + } } })