From a7eb9c294a575b5471ddec45ae75e1d09f7ace4c Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 7 Dec 2012 17:06:01 -0500
Subject: add noConflict functionality to all bootstrap plugins

---
 js/bootstrap-dropdown.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'js/bootstrap-dropdown.js')

diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 84e1dedb8..61f3b941a 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -124,6 +124,8 @@
   /* DROPDOWN PLUGIN DEFINITION
    * ========================== */
 
+  var old = $.fn.dropdown
+
   $.fn.dropdown = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -136,6 +138,15 @@
   $.fn.dropdown.Constructor = Dropdown
 
 
+ /* DROPDOWN NO CONFLICT
+  * ==================== */
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
   /* APPLY TO STANDARD DROPDOWN ELEMENTS
    * =================================== */
 
-- 
cgit v1.2.3


From 66b70016d0f083098c32ad051173e6f52a6b2084 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 7 Dec 2012 17:14:49 -0500
Subject: rebuild and only select visible dropdown items

---
 js/bootstrap-dropdown.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/bootstrap-dropdown.js')

diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 61f3b941a..726fbac1f 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -82,7 +82,7 @@
 
       if (!isActive || (isActive && e.keyCode == 27)) return $this.click()
 
-      $items = $('[role=menu] li:not(.divider) a', $parent)
+      $items = $('[role=menu] li:not(.divider):visible a', $parent)
 
       if (!$items.length) return
 
-- 
cgit v1.2.3


From 437654030aa283b92a260245b54fa17a417c20d8 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 7 Dec 2012 18:37:32 -0500
Subject: focus on escape in typeahead

---
 js/bootstrap-dropdown.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'js/bootstrap-dropdown.js')

diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 726fbac1f..900355d5b 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -53,9 +53,10 @@
 
       if (!isActive) {
         $parent.toggleClass('open')
-        $this.focus()
       }
 
+      $this.focus()
+
       return false
     }
 
-- 
cgit v1.2.3