mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Code Activity

Merge pull request #12983 from twbs/fat-9836

Browse Source 
fixes #9836
This commit is contained in:
Mark Otto
2014-03-08 20:10:04 -08:00
parent 90eb52495b b8ab0c66ac
commit e4d13e238d
7 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/js/bootstrap.js
Vendored
+4 -2
View File
@@ -516,7 +516,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.transitioning = 1
var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element
.removeClass('collapsing')
.addClass('collapse in')
@@ -555,7 +556,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.transitioning = 1
var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0
this.$element
.trigger('hidden.bs.collapse')
dist/js/bootstrap.min.js
Vendored
+1 -1
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.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/collapse.js
+4 -2
View File
@@ -56,7 +56,8 @@
this.transitioning = 1
var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.$element
.removeClass('collapsing')
.addClass('collapse in')
@@ -95,7 +96,8 @@
this.transitioning = 1
var complete = function () {
var complete = function (e) {
if (e && e.target != this.$element[0]) return
this.transitioning = 0
this.$element
.trigger('hidden.bs.collapse')
test-infra/npm-shrinkwrap.canonical.json
+1 -1
View File
File diff suppressed because one or more lines are too long