mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

grunt

Browse Source
This commit is contained in:
Mark Otto
2014-10-25 18:29:15 -07:00
parent 75620dadcc
commit 9bf9aab132
6 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/js/bootstrap.js
Vendored
+14 -3
View File
@@ -1972,9 +1972,15 @@ if (typeof jQuery === 'undefined') {
$active $active
.removeClass('active') .removeClass('active')
.find('> .dropdown-menu > .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) { if (transition) {
element[0].offsetWidth // reflow for transition element[0].offsetWidth // reflow for transition
@@ -1984,7 +1990,12 @@ if (typeof jQuery === 'undefined') {
} }
if (element.parent('.dropdown-menu')) { 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() callback && callback()
dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/js/bootstrap.js
Vendored
+14 -3
View File
@@ -1972,9 +1972,15 @@ if (typeof jQuery === 'undefined') {
$active $active
.removeClass('active') .removeClass('active')
.find('> .dropdown-menu > .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) { if (transition) {
element[0].offsetWidth // reflow for transition element[0].offsetWidth // reflow for transition
@@ -1984,7 +1990,12 @@ if (typeof jQuery === 'undefined') {
} }
if (element.parent('.dropdown-menu')) { 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() callback && callback()
docs/dist/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long