aboutsummaryrefslogtreecommitdiff
path: root/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorfat <[email protected]>2013-12-29 18:57:22 -0800
committerfat <[email protected]>2013-12-29 18:57:22 -0800
commit76f0d0ff32b6946dbd8c667a517a4deb69ad8890 (patch)
tree9702fead3ec0410dd4d4ead44fe447a3b782520c /dist/js/bootstrap.js
parent162d9e1776ef55d741ffc80f8694c16c40de32ca (diff)
downloadbootstrap-76f0d0ff32b6946dbd8c667a517a4deb69ad8890.tar.xz
bootstrap-76f0d0ff32b6946dbd8c667a517a4deb69ad8890.zip
fixes #11373 - adds related target to dropdown events
Diffstat (limited to 'dist/js/bootstrap.js')
-rw-r--r--dist/js/bootstrap.js17
1 files changed, 9 insertions, 8 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
index 07e64d2d2..ff0824c2b 100644
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -659,13 +659,14 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
}
- $parent.trigger(e = $.Event('show.bs.dropdown'))
+ var relatedTarget = { relatedTarget: this }
+ $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
if (e.isDefaultPrevented()) return
$parent
.toggleClass('open')
- .trigger('shown.bs.dropdown')
+ .trigger('shown.bs.dropdown', relatedTarget)
$this.focus()
}
@@ -704,14 +705,15 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
$items.eq(index).focus()
}
- function clearMenus() {
+ function clearMenus(e) {
$(backdrop).remove()
- $(toggle).each(function (e) {
+ $(toggle).each(function () {
var $parent = getParent($(this))
+ var relatedTarget = { relatedTarget: this }
if (!$parent.hasClass('open')) return
- $parent.trigger(e = $.Event('hide.bs.dropdown'))
+ $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
if (e.isDefaultPrevented()) return
- $parent.removeClass('open').trigger('hidden.bs.dropdown')
+ $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
})
}
@@ -1596,8 +1598,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
}
if (activeTarget && scrollTop <= offsets[0]) {
- debugger
- return activeTarget != (i = targets.first()[0]) && this.activate(i)
+ return activeTarget != (i = targets[0]) && this.activate(i)
}
for (i = offsets.length; i--;) {