aboutsummaryrefslogtreecommitdiff
path: root/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 /js
parent162d9e1776ef55d741ffc80f8694c16c40de32ca (diff)
downloadbootstrap-76f0d0ff32b6946dbd8c667a517a4deb69ad8890.tar.xz
bootstrap-76f0d0ff32b6946dbd8c667a517a4deb69ad8890.zip
fixes #11373 - adds related target to dropdown events
Diffstat (limited to 'js')
-rw-r--r--js/dropdown.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/js/dropdown.js b/js/dropdown.js
index 48752fda5..b19b255ae 100644
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -34,13 +34,14 @@
$('<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()
}
@@ -79,14 +80,15 @@
$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)
})
}