diff --git a/js/src/carousel.js b/js/src/carousel.js index 9ff7c09e729d2e43f4bfeca25d6cc3cf1785d3de..053659314164c194eeb174f1a0d7f66c2067e0a2 100644 --- a/js/src/carousel.js +++ b/js/src/carousel.js @@ -320,7 +320,7 @@ class Carousel { } } - [].slice.call(SelectorEngine.find(Selector.ITEM_IMG, this._element)).forEach((itemImg) => { + Util.makeArray(SelectorEngine.find(Selector.ITEM_IMG, this._element)).forEach((itemImg) => { EventHandler.on(itemImg, Event.DRAG_START, (e) => e.preventDefault()) }) @@ -356,7 +356,7 @@ class Carousel { _getItemIndex(element) { this._items = element && element.parentNode - ? [].slice.call(SelectorEngine.find(Selector.ITEM, element.parentNode)) + ? Util.makeArray(SelectorEngine.find(Selector.ITEM, element.parentNode)) : [] return this._items.indexOf(element) diff --git a/js/src/dom/polyfill.js b/js/src/dom/polyfill.js index 8644dc702249bb873a55b9584f5feed40e269cb7..cbae0f668e1dc0a4b0018ff46e259e87d282cc6a 100644 --- a/js/src/dom/polyfill.js +++ b/js/src/dom/polyfill.js @@ -1,5 +1,3 @@ -import Util from '../util' - /** * -------------------------------------------------------------------------- * Bootstrap (v4.3.1): dom/polyfill.js @@ -7,6 +5,8 @@ import Util from '../util' * -------------------------------------------------------------------------- */ +import Util from '../util' + /* istanbul ignore next */ const Polyfill = (() => { // MSEdge resets defaultPrevented flag upon dispatchEvent call if at least one listener is attached diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 90006c66d3e019a35efb478a3b26a915609361dd..2b517266ce82dde8ccbc4f25dce390dab3741ebd 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -482,7 +482,7 @@ class Dropdown { return } - const items = [].slice.call(parent.querySelectorAll(Selector.VISIBLE_ITEMS)) + const items = Util.makeArray(parent.querySelectorAll(Selector.VISIBLE_ITEMS)) if (!items.length) { return diff --git a/js/src/index.js b/js/src/index.js index aa35ed07b30b35894b2c11b15566960936ddbf1a..8a0044fe53d3383b515cb27797b4c0d51f585b07 100644 --- a/js/src/index.js +++ b/js/src/index.js @@ -1,3 +1,10 @@ +/** + * -------------------------------------------------------------------------- + * Bootstrap (v4.3.1): index.js + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * -------------------------------------------------------------------------- + */ + import Alert from './alert' import Button from './button' import Carousel from './carousel' @@ -11,13 +18,6 @@ import Toast from './toast' import Tooltip from './tooltip' import Util from './util' -/** - * -------------------------------------------------------------------------- - * Bootstrap (v4.3.1): index.js - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * -------------------------------------------------------------------------- - */ - export { Util, Alert, diff --git a/js/src/tools/sanitizer.js b/js/src/tools/sanitizer.js index ff78d06a73f74a3380b2c16d63c2172b5bf39d7a..3c1608fee8e3f631a39cc910fe144cd74de6ca11 100644 --- a/js/src/tools/sanitizer.js +++ b/js/src/tools/sanitizer.js @@ -5,6 +5,8 @@ * -------------------------------------------------------------------------- */ +import Util from '../util' + const uriAttrs = [ 'background', 'cite', @@ -101,7 +103,7 @@ export function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) { const domParser = new window.DOMParser() const createdDocument = domParser.parseFromString(unsafeHtml, 'text/html') const whitelistKeys = Object.keys(whiteList) - const elements = [].slice.call(createdDocument.body.querySelectorAll('*')) + const elements = Util.makeArray(createdDocument.body.querySelectorAll('*')) for (let i = 0, len = elements.length; i < len; i++) { const el = elements[i] @@ -113,7 +115,7 @@ export function sanitizeHtml(unsafeHtml, whiteList, sanitizeFn) { continue } - const attributeList = [].slice.call(el.attributes) + const attributeList = Util.makeArray(el.attributes) const whitelistedAttributes = [].concat(whiteList['*'] || [], whiteList[elName] || []) attributeList.forEach((attr) => {