mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-02 02:29:24 +01:00
Merge branch 'fix_hide_before_show_bug' of https://github.com/aaronj1335/bootstrap into aaronj1335-fix_hide_before_show_bug
This commit is contained in:
commit
7a153ac817
6
js/bootstrap-modal.js
vendored
6
js/bootstrap-modal.js
vendored
@ -100,6 +100,10 @@
|
|||||||
, hide: function (e) {
|
, hide: function (e) {
|
||||||
e && e.preventDefault()
|
e && e.preventDefault()
|
||||||
|
|
||||||
|
if (! this.isShown) {
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
var that = this
|
var that = this
|
||||||
this.isShown = false
|
this.isShown = false
|
||||||
|
|
||||||
@ -235,4 +239,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery || window.ender );
|
}( window.jQuery || window.ender );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user