grunt

9bf9aab1 · Mark Otto · 75620dad · 9bf9aab1 · 9bf9aab1 · 9bf9aab1
Commit 9bf9aab1 authored 10 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 34 additions and 12 deletions
+34 -12
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -1972,9 +1972,15 @@ if (typeof jQuery === 'undefined') {
      $active
        .removeClass('active')
        .find('> .dropdown-menu > .active')
-        .removeClass('active')
+          .removeClass('active')
+        .end()
+        .find('[data-toggle="tab"]')
+          .attr('aria-expanded', false)

-      element.addClass('active')
+      element
+        .addClass('active')
+        .find('[data-toggle="tab"]')
+          .attr('aria-expanded', true)

      if (transition) {
        element[0].offsetWidth // reflow for transition
@@ -1984,7 +1990,12 @@ if (typeof jQuery === 'undefined') {
      }

      if (element.parent('.dropdown-menu')) {
-        element.closest('li.dropdown').addClass('active')
+        element
+          .closest('li.dropdown')
+            .addClass('active')
+          .end()
+          .find('[data-toggle="tab"]')
+            .attr('aria-expanded', true)
      }

      callback && callback()

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/assets/js/raw-files.min.js
+++ b/docs/assets/js/raw-files.min.js
--- a/docs/dist/js/bootstrap.js
+++ b/docs/dist/js/bootstrap.js
@@ -1972,9 +1972,15 @@ if (typeof jQuery === 'undefined') {
      $active
        .removeClass('active')
        .find('> .dropdown-menu > .active')
-        .removeClass('active')
+          .removeClass('active')
+        .end()
+        .find('[data-toggle="tab"]')
+          .attr('aria-expanded', false)

-      element.addClass('active')
+      element
+        .addClass('active')
+        .find('[data-toggle="tab"]')
+          .attr('aria-expanded', true)

      if (transition) {
        element[0].offsetWidth // reflow for transition
@@ -1984,7 +1990,12 @@ if (typeof jQuery === 'undefined') {
      }

      if (element.parent('.dropdown-menu')) {
-        element.closest('li.dropdown').addClass('active')
+        element
+          .closest('li.dropdown')
+            .addClass('active')
+          .end()
+          .find('[data-toggle="tab"]')
+            .attr('aria-expanded', true)
      }

      callback && callback()

--- a/docs/dist/js/bootstrap.min.js
+++ b/docs/dist/js/bootstrap.min.js