diff options
| author | Mark Otto <[email protected]> | 2013-08-17 14:16:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 14:16:40 -0700 |
| commit | 441e04c84a8a5dd4f55aad61c35c54aded41cc1d (patch) | |
| tree | 19ffb09d1f884c897f2ea32c39244954eaab02ca /js | |
| parent | ffbec23c982de7496743212afb8d75005e52199c (diff) | |
| parent | 1b814ddd0a5768ff8ee85bef28f026e06fbace93 (diff) | |
| download | bootstrap-441e04c84a8a5dd4f55aad61c35c54aded41cc1d.tar.xz bootstrap-441e04c84a8a5dd4f55aad61c35c54aded41cc1d.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
dist/css/bootstrap.min.css
getting-started.html
Diffstat (limited to 'js')
| -rw-r--r-- | js/modal.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/modal.js b/js/modal.js index e0f8b7a0e..1a692e6af 100644 --- a/js/modal.js +++ b/js/modal.js @@ -238,7 +238,7 @@ }) $(document) - .on('shown.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) + .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) }(window.jQuery); |