diff options
| author | Jacob Thornton <[email protected]> | 2011-09-29 23:31:26 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-29 23:31:26 -0700 |
| commit | 7a153ac817f7d0fb7d07bbc852b91b9ec87d4af7 (patch) | |
| tree | 6361f96c4bb4debe3e59a2db4589052e7c824d92 /js | |
| parent | a0c3250b97bd74a542c6b3dd555197097935e590 (diff) | |
| parent | 616f136371e84913ea934bdfba8a6f241381f8e7 (diff) | |
| download | bootstrap-7a153ac817f7d0fb7d07bbc852b91b9ec87d4af7.tar.xz bootstrap-7a153ac817f7d0fb7d07bbc852b91b9ec87d4af7.zip | |
Merge branch 'fix_hide_before_show_bug' of https://github.com/aaronj1335/bootstrap into aaronj1335-fix_hide_before_show_bug
Diffstat (limited to 'js')
| -rw-r--r-- | js/bootstrap-modal.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 55b5fb77c..6370a02a4 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -100,6 +100,10 @@ , hide: function (e) { e && e.preventDefault() + if (! this.isShown) { + return this + } + var that = this this.isShown = false @@ -235,4 +239,4 @@ }) }) -}( window.jQuery || window.ender );
\ No newline at end of file +}( window.jQuery || window.ender ); |