diff options
| author | Chris Rebert <[email protected]> | 2014-06-19 14:51:52 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-06-19 14:51:52 -0700 |
| commit | 9488bd58f90c8435c20dd4e596244d10f8b698fa (patch) | |
| tree | c6099419b19a3ce59582d2aaee9dd9a47b5ac2b8 /js/modal.js | |
| parent | a33f6f89301914dcca781db5f8d8b8ad5fcd54ea (diff) | |
| parent | f983e4944f474d3bbfb9ac1890465881c759d397 (diff) | |
| download | bootstrap-9488bd58f90c8435c20dd4e596244d10f8b698fa.tar.xz bootstrap-9488bd58f90c8435c20dd4e596244d10f8b698fa.zip | |
Merge pull request #13867 from hnrch02/remove-depreacted-jscs-rules
Remove deprecated JSCS rules
Diffstat (limited to 'js/modal.js')
| -rw-r--r-- | js/modal.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/modal.js b/js/modal.js index 2241e7b1e..359e1fc67 100644 --- a/js/modal.js +++ b/js/modal.js @@ -267,13 +267,13 @@ $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { var $this = $(this) var href = $this.attr('href') - var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7 var option = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data()) if ($this.is('a')) e.preventDefault() $target.one('show.bs.modal', function (showEvent) { - if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown + if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown $target.one('hidden.bs.modal', function () { $this.is(':visible') && $this.trigger('focus') }) |