diff --git a/js/src/popover.js b/js/src/popover.js index 8beec963a2b061eedaedd722570a4f0afb6c02f7..00a97a3f0158478d001d0c16720a7a56f8319266 100644 --- a/js/src/popover.js +++ b/js/src/popover.js @@ -28,22 +28,18 @@ const Popover = (($) => { const Default = { ...Tooltip.Default, - ...{ - placement : 'right', - trigger : 'click', - content : '', - template : '<div class="popover" role="tooltip">' - + '<div class="arrow"></div>' - + '<h3 class="popover-header"></h3>' - + '<div class="popover-body"></div></div>' - } + placement : 'right', + trigger : 'click', + content : '', + template : '<div class="popover" role="tooltip">' + + '<div class="arrow"></div>' + + '<h3 class="popover-header"></h3>' + + '<div class="popover-body"></div></div>' } const DefaultType = { ...Tooltip.DefaultType, - ...{ - content : '(string|element|function)' - } + content : '(string|element|function)' } const ClassName = { diff --git a/js/src/tooltip.js b/js/src/tooltip.js index 002dea429835fc9a30f858296e24f8388da76889..573997e7da2dc2ada27a712cbd32c4dab084a681 100644 --- a/js/src/tooltip.js +++ b/js/src/tooltip.js @@ -503,10 +503,8 @@ const Tooltip = (($) => { if (this.config.selector) { this.config = { ...this.config, - ...{ - trigger : 'manual', - selector : '' - } + trigger : 'manual', + selector : '' } } else { this._fixTitle()