]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Remove redundant check on `data-toggle` click.
authorGeoSot <geo.sotis@gmail.com>
Wed, 9 Jun 2021 22:10:14 +0000 (01:10 +0300)
committerXhmikosR <xhmikosr@gmail.com>
Thu, 29 Jul 2021 13:30:02 +0000 (16:30 +0300)
Previously, it was assumed that the trigger element would have its own separate config than the collapse element itself.

js/src/collapse.js

index a8651fc0a90788c034f83be5b97cff36e80484c2..fcb8be6d7de0b514121382c89794572f314baa39 100644 (file)
@@ -347,26 +347,16 @@ EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, function (
     event.preventDefault()
   }
 
-  const triggerData = Manipulator.getDataAttributes(this)
   const selector = getSelectorFromElement(this)
   const selectorElements = SelectorEngine.find(selector)
 
   selectorElements.forEach(element => {
     const data = Collapse.getInstance(element)
-    let config
     if (data) {
-      // update parent attribute
-      if (data._parent === null && typeof triggerData.parent === 'string') {
-        data._config.parent = triggerData.parent
-        data._parent = data._getParent()
-      }
-
-      config = 'toggle'
+      data.toggle()
     } else {
-      config = triggerData
+      Collapse.getOrCreateInstance(element)
     }
-
-    Collapse.collapseInterface(element, config)
   })
 })