diff options
| author | Heinrich Fenkart <[email protected]> | 2014-02-16 20:06:31 +0100 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2014-02-16 21:00:04 +0100 |
| commit | 8a78bc065f866763607f104907b7a2ac9fa6ceec (patch) | |
| tree | 5c13df1beae3be4e5168c22a76ce42a399f3045f /js | |
| parent | accc95ccd63f8aa903fa07bea55ef34794d84cc5 (diff) | |
| download | bootstrap-8a78bc065f866763607f104907b7a2ac9fa6ceec.tar.xz bootstrap-8a78bc065f866763607f104907b7a2ac9fa6ceec.zip | |
Remove event aliases from JavaScript
Makes life for people with custom jQuery builds excluding event aliases much easier.
Diffstat (limited to 'js')
| -rw-r--r-- | js/dropdown.js | 8 | ||||
| -rw-r--r-- | js/modal.js | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/js/dropdown.js b/js/dropdown.js index 43d7ae3ea..6e206a0d1 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -44,7 +44,7 @@ .toggleClass('open') .trigger('shown.bs.dropdown', relatedTarget) - $this.focus() + $this.trigger('focus') } return false @@ -64,8 +64,8 @@ var isActive = $parent.hasClass('open') if (!isActive || (isActive && e.keyCode == 27)) { - if (e.which == 27) $parent.find(toggle).focus() - return $this.click() + if (e.which == 27) $parent.find(toggle).trigger('focus') + return $this.trigger('click') } var desc = ' li:not(.divider):visible a' @@ -79,7 +79,7 @@ if (e.keyCode == 40 && index < $items.length - 1) index++ // down if (!~index) index = 0 - $items.eq(index).focus() + $items.eq(index).trigger('focus') } function clearMenus(e) { diff --git a/js/modal.js b/js/modal.js index 20ff27046..f6dc477b1 100644 --- a/js/modal.js +++ b/js/modal.js @@ -78,10 +78,10 @@ transition ? that.$element.find('.modal-dialog') // wait for modal to slide in .one($.support.transition.end, function () { - that.$element.focus().trigger(e) + that.$element.trigger('focus').trigger(e) }) .emulateTransitionEnd(300) : - that.$element.focus().trigger(e) + that.$element.trigger('focus').trigger(e) }) } @@ -117,7 +117,7 @@ .off('focusin.bs.modal') // guard against infinite focus loop .on('focusin.bs.modal', $.proxy(function (e) { if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { - this.$element.focus() + this.$element.trigger('focus') } }, this)) } @@ -232,7 +232,7 @@ $target .modal(option, this) .one('hide', function () { - $this.is(':visible') && $this.focus() + $this.is(':visible') && $this.trigger('focus') }) }) |