diff options
| author | Mark Otto <[email protected]> | 2014-05-20 23:21:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-20 23:21:12 -0700 |
| commit | 91d51d3fba1cc2f80138bb2858ce67c28c9c8a89 (patch) | |
| tree | 32fd8faabe6fdb8d17aea70fc7ccd56524d92aba /js/modal.js | |
| parent | c42cd8164c8698cbc3acfbb99e525bd8f195d819 (diff) | |
| parent | 3dd1531d81c90d6d1cf04962032f868d315ab21c (diff) | |
| download | bootstrap-91d51d3fba1cc2f80138bb2858ce67c28c9c8a89.tar.xz bootstrap-91d51d3fba1cc2f80138bb2858ce67c28c9c8a89.zip | |
Merge branch 'master' into icon_paths
Diffstat (limited to 'js/modal.js')
| -rw-r--r-- | js/modal.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/modal.js b/js/modal.js index ae1b8e598..a89eb0c09 100644 --- a/js/modal.js +++ b/js/modal.js @@ -30,6 +30,8 @@ } } + Modal.VERSION = '3.1.1' + Modal.DEFAULTS = { backdrop: true, keyboard: true, @@ -267,7 +269,7 @@ if ($this.is('a')) e.preventDefault() Plugin.call($target, option, this) - $target.one('hide', function () { + $target.one('hide.bs.modal', function () { $this.is(':visible') && $this.trigger('focus') }) }) |