Attempting to fix #122

thednp · Mar 21, 2017 · f888c54 · f888c54
1 parent 4171f48
commit f888c54
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 20 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap.native",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "homepage": "http://thednp.github.io/bootstrap.native/",
   "authors": [
     "dnp_theme"

diff --git a/dist/bootstrap-native-v4.js b/dist/bootstrap-native-v4.js
@@ -1,4 +1,4 @@
-// Native Javascript for Bootstrap 4 v2.0.6 | © dnp_theme | MIT-License
+// Native Javascript for Bootstrap 4 v2.0.8 | © dnp_theme | MIT-License
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD support:
@@ -737,9 +737,16 @@
       removeClass(element,collapsed);
 
       if ( accordion !== null ) {
-        var activeCollapses = getElementsByClassName(accordion,component+' '+showClass);
+        var activeCollapses = getElementsByClassName(accordion,component+' '+showClass),
+            allToggles = accordion.querySelectorAll('['+dataToggle+'="'+component+'"]'),
+            correspondingCollapse;
         for (var i=0, al=activeCollapses[length]; i<al; i++) {
-          if ( activeCollapses[i] !== collapse) closeAction(activeCollapses[i]);
+          if ( activeCollapses[i] !== collapse ) { closeAction(activeCollapses[i]); }
+        }
+        for (var u=0, atl=allToggles[length]; u<atl; u++) {
+          correspondingCollapse = allToggles[u][getAttribute][dataTarget] || allToggles[u].href;
+          if ( correspondingCollapse.split('#')[1] !== collapse.id ) { addClass(allToggles[u],collapsed); } 
+          else { removeClass(allToggles[u],collapsed); }
         }
       }
     };
@@ -1500,8 +1507,8 @@
     element = queryElement(element);
 
     // DATA API
-    var animationData = element[getAttribute](dataAnimation);
-        placementData = element[getAttribute](dataPlacement);
+    var animationData = element[getAttribute](dataAnimation),
+        placementData = element[getAttribute](dataPlacement),
         delayData = element[getAttribute](dataDelay),
         containerData = element[getAttribute](dataContainer),
 

diff --git a/dist/bootstrap-native-v4.min.js b/dist/bootstrap-native-v4.min.js
diff --git a/dist/bootstrap-native.js b/dist/bootstrap-native.js
@@ -1,4 +1,4 @@
-// Native Javascript for Bootstrap 3 v2.0.7 | © dnp_theme | MIT-License
+// Native Javascript for Bootstrap 3 v2.0.8 | © dnp_theme | MIT-License
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD support:
@@ -823,7 +823,7 @@
 
 
     // event targets and constants
-    var accordion = null, collapse = null, self = this, 
+    var accordion = null, collapse = null, self = this,
       isAnimating = false, // when true it will prevent click handlers
       accordionData = element[getAttribute]('data-parent'),
 
@@ -894,9 +894,16 @@
       removeClass(element,collapsed);
 
       if ( accordion !== null ) {
-        var activeCollapses = getElementsByClassName(accordion,component+' '+inClass);
+        var activeCollapses = getElementsByClassName(accordion,component+' '+inClass),
+            allToggles = accordion[querySelectorAll]('['+dataToggle+'="'+component+'"]'),
+            correspondingCollapse;
         for (var i=0, al=activeCollapses[length]; i<al; i++) {
-          if ( activeCollapses[i] !== collapse) closeAction(activeCollapses[i]);
+          if ( activeCollapses[i] !== collapse ) { closeAction(activeCollapses[i]); }
+        }
+        for (var u=0, atl=allToggles[length]; u<atl; u++) {
+          correspondingCollapse = allToggles[u][getAttribute][dataTarget] || allToggles[u].href;
+          if ( correspondingCollapse.split('#')[1] !== collapse.id ) { addClass(allToggles[u],collapsed); } 
+          else { removeClass(allToggles[u],collapsed); }
         }
       }
     };

diff --git a/dist/bootstrap-native.min.js b/dist/bootstrap-native.min.js
diff --git a/lib/V3/collapse-native.js b/lib/V3/collapse-native.js
@@ -14,7 +14,7 @@ var Collapse = function( element, options ) {
 
 
   // event targets and constants
-  var accordion = null, collapse = null, self = this, 
+  var accordion = null, collapse = null, self = this,
     isAnimating = false, // when true it will prevent click handlers
     accordionData = element[getAttribute]('data-parent'),
 
@@ -85,9 +85,16 @@ var Collapse = function( element, options ) {
     removeClass(element,collapsed);
 
     if ( accordion !== null ) {
-      var activeCollapses = getElementsByClassName(accordion,component+' '+inClass);
+      var activeCollapses = getElementsByClassName(accordion,component+' '+inClass),
+          allToggles = accordion[querySelectorAll]('['+dataToggle+'="'+component+'"]'),
+          correspondingCollapse;
       for (var i=0, al=activeCollapses[length]; i<al; i++) {
-        if ( activeCollapses[i] !== collapse) closeAction(activeCollapses[i]);
+        if ( activeCollapses[i] !== collapse ) { closeAction(activeCollapses[i]); }
+      }
+      for (var u=0, atl=allToggles[length]; u<atl; u++) {
+        correspondingCollapse = allToggles[u][getAttribute][dataTarget] || allToggles[u].href;
+        if ( correspondingCollapse.split('#')[1] !== collapse.id ) { addClass(allToggles[u],collapsed); } 
+        else { removeClass(allToggles[u],collapsed); }
       }
     }
   };

diff --git a/lib/V4/collapse-native.js b/lib/V4/collapse-native.js
@@ -85,9 +85,16 @@ var Collapse = function( element, options ) {
     removeClass(element,collapsed);
 
     if ( accordion !== null ) {
-      var activeCollapses = getElementsByClassName(accordion,component+' '+showClass);
+      var activeCollapses = getElementsByClassName(accordion,component+' '+showClass),
+          allToggles = accordion.querySelectorAll('['+dataToggle+'="'+component+'"]'),
+          correspondingCollapse;
       for (var i=0, al=activeCollapses[length]; i<al; i++) {
-        if ( activeCollapses[i] !== collapse) closeAction(activeCollapses[i]);
+        if ( activeCollapses[i] !== collapse ) { closeAction(activeCollapses[i]); }
+      }
+      for (var u=0, atl=allToggles[length]; u<atl; u++) {
+        correspondingCollapse = allToggles[u][getAttribute][dataTarget] || allToggles[u].href;
+        if ( correspondingCollapse.split('#')[1] !== collapse.id ) { addClass(allToggles[u],collapsed); } 
+        else { removeClass(allToggles[u],collapsed); }
       }
     }
   };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap.native",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Native Javascript for Bootstrap, the sweetest Javascript library without jQuery.",
   "main": "dist/bootstrap-native.js",
   "scripts": {