aboutsummaryrefslogtreecommitdiff
path: root/js/src/collapse.js
diff options
context:
space:
mode:
authorJohann-S <[email protected]>2018-11-14 10:16:56 +0100
committerJohann-S <[email protected]>2018-11-14 10:54:50 +0100
commit9201a805101943f9ec088639d520d7d2874bbed1 (patch)
treeb103dea4a9d52bac3bb849c6c14277f4000a1f9c /js/src/collapse.js
parentfab1dea92773e796a75ac4a2fadb645714ac80ce (diff)
downloadbootstrap-9201a805101943f9ec088639d520d7d2874bbed1.tar.xz
bootstrap-9201a805101943f9ec088639d520d7d2874bbed1.zip
some cleaning and changes for readability
Diffstat (limited to 'js/src/collapse.js')
-rw-r--r--js/src/collapse.js11
1 files changed, 7 insertions, 4 deletions
diff --git a/js/src/collapse.js b/js/src/collapse.js
index 6fe0e4a98..bf154ab25 100644
--- a/js/src/collapse.js
+++ b/js/src/collapse.js
@@ -1,6 +1,3 @@
-import $ from 'jquery'
-import Util from './util'
-
/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.3): collapse.js
@@ -8,6 +5,9 @@ import Util from './util'
* --------------------------------------------------------------------------
*/
+import $ from 'jquery'
+import Util from './util'
+
/**
* ------------------------------------------------------------------------
* Constants
@@ -67,10 +67,11 @@ class Collapse {
this._isTransitioning = false
this._element = element
this._config = this._getConfig(config)
- this._triggerArray = $.makeArray(document.querySelectorAll(
+ this._triggerArray = [].slice.call(document.querySelectorAll(
`[data-toggle="collapse"][href="#${element.id}"],` +
`[data-toggle="collapse"][data-target="#${element.id}"]`
))
+
const toggleList = [].slice.call(document.querySelectorAll(Selector.DATA_TOGGLE))
for (let i = 0, len = toggleList.length; i < len; i++) {
const elem = toggleList[i]
@@ -227,6 +228,7 @@ class Collapse {
for (let i = 0; i < triggerArrayLength; i++) {
const trigger = this._triggerArray[i]
const selector = Util.getSelectorFromElement(trigger)
+
if (selector !== null) {
const $elem = $([].slice.call(document.querySelectorAll(selector)))
if (!$elem.hasClass(ClassName.SHOW)) {
@@ -375,6 +377,7 @@ $(document).on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, function (event) {
const $trigger = $(this)
const selector = Util.getSelectorFromElement(this)
const selectors = [].slice.call(document.querySelectorAll(selector))
+
$(selectors).each(function () {
const $target = $(this)
const data = $target.data(DATA_KEY)