diff options
| author | Mark Otto <[email protected]> | 2013-08-17 15:08:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-17 15:08:02 -0700 |
| commit | 5ba19dc8849b1b87836404acfa8bbb336db1e496 (patch) | |
| tree | 1b71bf66ebb1f8ec38522db3c96a8fd8b7cbd7df /js | |
| parent | 4f97df8aa42d2609efd52ea21f1e84124afbe39d (diff) | |
| parent | a01b1dd71ac56667becb42d245213bf698d2cc36 (diff) | |
| download | bootstrap-5ba19dc8849b1b87836404acfa8bbb336db1e496.tar.xz bootstrap-5ba19dc8849b1b87836404acfa8bbb336db1e496.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
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 0b392d161..65eba481e 100644 --- a/js/modal.js +++ b/js/modal.js @@ -78,7 +78,7 @@ var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) transition ? - that.$element + that.$element.find('.modal-dialog') // wait for modal to slide in .one($.support.transition.end, function () { that.$element.focus().trigger(e) }) |