diff options
| author | Vasilii Artemchuk <[email protected]> | 2017-11-15 11:44:17 +0300 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2017-11-15 09:44:17 +0100 |
| commit | 2cafb9f127f1772d9831c2de4fe567b061303f0a (patch) | |
| tree | 464b34f50c700707aa2c2d15fbfea926c8b7b0be /js | |
| parent | c81ce9fdf4f05310f180b949681c28db1b47aed2 (diff) | |
| download | bootstrap-2cafb9f127f1772d9831c2de4fe567b061303f0a.tar.xz bootstrap-2cafb9f127f1772d9831c2de4fe567b061303f0a.zip | |
Simplify spread (#24774)
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/popover.js | 20 | ||||
| -rw-r--r-- | js/src/tooltip.js | 6 |
2 files changed, 10 insertions, 16 deletions
diff --git a/js/src/popover.js b/js/src/popover.js index 8beec963a..00a97a3f0 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 002dea429..573997e7d 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() |