diff options
| author | Mark Otto <[email protected]> | 2019-07-23 23:13:50 -0700 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2019-07-24 09:13:50 +0300 |
| commit | 114a0ee193ffe7869c8369f25ef4dcc44929fbf5 (patch) | |
| tree | 15e6e79c2f1b06eff34de7fba10bab2ec5dd0070 /js/dist/scrollspy.js | |
| parent | e101ba4989c1930206ac2a092246612bab105f8e (diff) | |
| download | bootstrap-114a0ee193ffe7869c8369f25ef4dcc44929fbf5.tar.xz bootstrap-114a0ee193ffe7869c8369f25ef4dcc44929fbf5.zip | |
Rebuild the dist to pickup new utilities file (#29105)
Dist after adding new utils file
Diffstat (limited to 'js/dist/scrollspy.js')
| -rw-r--r-- | js/dist/scrollspy.js | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/js/dist/scrollspy.js b/js/dist/scrollspy.js index 7c8fdf447..e4d1c05ec 100644 --- a/js/dist/scrollspy.js +++ b/js/dist/scrollspy.js @@ -4,8 +4,8 @@ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ (function (global, factory) { - typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('./dom/data.js'), require('./dom/event-handler.js'), require('./dom/manipulator.js'), require('./dom/selector-engine.js')) : - typeof define === 'function' && define.amd ? define(['./dom/data.js', './dom/event-handler.js', './dom/manipulator.js', './dom/selector-engine.js'], factory) : + typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('../dom/data.js'), require('../dom/event-handler.js'), require('../dom/manipulator.js'), require('../dom/selector-engine.js')) : + typeof define === 'function' && define.amd ? define(['../dom/data.js', '../dom/event-handler.js', '../dom/manipulator.js', '../dom/selector-engine.js'], factory) : (global = global || self, global.ScrollSpy = factory(global.Data, global.EventHandler, global.Manipulator, global.SelectorEngine)); }(this, function (Data, EventHandler, Manipulator, SelectorEngine) { 'use strict'; @@ -45,20 +45,35 @@ return obj; } - function _objectSpread(target) { + function ownKeys(object, enumerableOnly) { + var keys = Object.keys(object); + + if (Object.getOwnPropertySymbols) { + var symbols = Object.getOwnPropertySymbols(object); + if (enumerableOnly) symbols = symbols.filter(function (sym) { + return Object.getOwnPropertyDescriptor(object, sym).enumerable; + }); + keys.push.apply(keys, symbols); + } + + return keys; + } + + function _objectSpread2(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; - var ownKeys = Object.keys(source); - if (typeof Object.getOwnPropertySymbols === 'function') { - ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { - return Object.getOwnPropertyDescriptor(source, sym).enumerable; - })); + if (i % 2) { + ownKeys(source, true).forEach(function (key) { + _defineProperty(target, key, source[key]); + }); + } else if (Object.getOwnPropertyDescriptors) { + Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); + } else { + ownKeys(source).forEach(function (key) { + Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); + }); } - - ownKeys.forEach(function (key) { - _defineProperty(target, key, source[key]); - }); } return target; @@ -263,7 +278,7 @@ ; _proto._getConfig = function _getConfig(config) { - config = _objectSpread({}, Default, typeof config === 'object' && config ? config : {}); + config = _objectSpread2({}, Default, {}, typeof config === 'object' && config ? config : {}); if (typeof config.target !== 'string') { var id = config.target.id; @@ -434,6 +449,8 @@ * ------------------------------------------------------------------------ */ + /* istanbul ignore if */ + if (typeof jQuery !== 'undefined') { var JQUERY_NO_CONFLICT = jQuery.fn[NAME]; jQuery.fn[NAME] = ScrollSpy._jQueryInterface; |
