Permalink
Browse files

Remove event aliases from JavaScript

Makes life for people with custom jQuery builds excluding event aliases much easier.
  • Loading branch information...
1 parent accc95c commit 8a78bc065f866763607f104907b7a2ac9fa6ceec @hnrch02 hnrch02 committed Feb 16, 2014
Showing with 16 additions and 16 deletions.
  1. +8 −8 dist/js/bootstrap.js
  2. +4 −4 js/dropdown.js
  3. +4 −4 js/modal.js
View
16 dist/js/bootstrap.js
@@ -675,7 +675,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
.toggleClass('open')
.trigger('shown.bs.dropdown', relatedTarget)
- $this.focus()
+ $this.trigger('focus')
}
return false
@@ -695,8 +695,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
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'
@@ -710,7 +710,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
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) {
@@ -857,10 +857,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
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)
})
}
@@ -896,7 +896,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
.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))
}
@@ -1011,7 +1011,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
$target
.modal(option, this)
.one('hide', function () {
- $this.is(':visible') && $this.focus()
+ $this.is(':visible') && $this.trigger('focus')
})
})
View
8 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) {
View
8 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')
})
})

0 comments on commit 8a78bc0

Please sign in to comment.