diff options
author | Jacob Thornton <jacobthornton@gmail.com> | 2012-10-18 10:05:16 +0400 |
---|---|---|
committer | Jacob Thornton <jacobthornton@gmail.com> | 2012-10-18 10:05:16 +0400 |
commit | 7f3b94c45315475a129ace3c22e122808c2dbcaa (patch) | |
tree | 0b963ce17c8bd8c5f43356da36015daee7295ede /js/bootstrap-modal.js | |
parent | 280d4aeb30aa6b29ec74bd801ad1be3fc05e01f4 (diff) | |
parent | e1f6458e3640a628cdb6b2e4c63950777d46e141 (diff) |
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
js/bootstrap-carousel.js
Diffstat (limited to 'js/bootstrap-modal.js')
-rw-r--r-- | js/bootstrap-modal.js | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index d2a4878b3d..185519aaf8 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -214,21 +214,19 @@ /* MODAL DATA-API * ============== */ - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) - - e.preventDefault() - - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) + $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + , href = $this.attr('href') + , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) + + e.preventDefault() + + $target + .modal(option) + .one('hide', function () { + $this.focus() + }) }) }(window.jQuery); |