From b1eb3fccfa722afc4f7ca0d00eb848353ce8aed8 Mon Sep 17 00:00:00 2001 From: Johann-S Date: Mon, 30 Apr 2018 16:37:45 +0200 Subject: refactor(plugins): improve how we query elements --- js/src/scrollspy.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'js/src/scrollspy.js') diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 90905b05dd..02cab5372d 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -225,7 +225,8 @@ const ScrollSpy = (($) => { return } - for (let i = this._offsets.length; i--;) { + const offsetLength = this._offsets.length + for (let i = offsetLength; i--;) { const isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && (typeof this._offsets[i + 1] === 'undefined' || @@ -302,9 +303,10 @@ const ScrollSpy = (($) => { */ $(window).on(Event.LOAD_DATA_API, () => { - const scrollSpys = $.makeArray($(Selector.DATA_SPY)) + const scrollSpys = [].slice.call(document.querySelectorAll(Selector.DATA_SPY)) - for (let i = scrollSpys.length; i--;) { + const scrollSpysLength = scrollSpys.length + for (let i = scrollSpysLength; i--;) { const $spy = $(scrollSpys[i]) ScrollSpy._jQueryInterface.call($spy, $spy.data()) } -- cgit v1.2.3