From 6ec7c72e5b5152afb676c43ea57a51fb625f9ba2 Mon Sep 17 00:00:00 2001
From: Paul McLanahan <paul@mclanahan.net>
Date: Fri, 9 Nov 2012 11:48:21 -0500
Subject: Fix issue with double move event firing in typeahead.

Fix test to catch issue.
Fix #5806.
---
 js/bootstrap-typeahead.js            |  2 +-
 js/tests/unit/bootstrap-typeahead.js | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 512d91acb..26d845258 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -217,7 +217,7 @@
     }
 
   , keydown: function (e) {
-      this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
       this.move(e)
     }
 
diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
index 16bdb9194..b796a33b3 100644
--- a/js/tests/unit/bootstrap-typeahead.js
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -137,10 +137,19 @@ $(function () {
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
         ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
 
+        // simulate entire key pressing event
         $input.trigger({
           type: 'keydown'
         , keyCode: 40
         })
+        .trigger({
+          type: 'keypress'
+        , keyCode: 40
+        })
+        .trigger({
+          type: 'keyup'
+        , keyCode: 40
+        })
 
         ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active")
 
@@ -149,6 +158,14 @@ $(function () {
           type: 'keydown'
         , keyCode: 38
         })
+        .trigger({
+          type: 'keypress'
+        , keyCode: 38
+        })
+        .trigger({
+          type: 'keyup'
+        , keyCode: 38
+        })
 
         ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
 
@@ -196,4 +213,4 @@ $(function () {
 
         typeahead.$menu.remove()
       })
-})
\ No newline at end of file
+})
-- 
cgit v1.2.3


From 8b959cacbc26666c13fd0e893a3f563ac4f9d09e Mon Sep 17 00:00:00 2001
From: Godric <godric@0x3f.fr>
Date: Tue, 4 Dec 2012 01:21:07 +0100
Subject: Update js/bootstrap-scrollspy.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
---
 js/bootstrap-scrollspy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js')

diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
index 3ffda2ebe..ace6b8703 100644
--- a/js/bootstrap-scrollspy.js
+++ b/js/bootstrap-scrollspy.js
@@ -59,7 +59,7 @@
               , $href = /^#\w/.test(href) && $(href)
             return ( $href
               && $href.length
-              && [[ $href.position().top, href ]] ) || null
+              && [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null
           })
           .sort(function (a, b) { return a[0] - b[0] })
           .each(function () {
-- 
cgit v1.2.3


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-affix.js                | 11 +++++++++++
 js/bootstrap-alert.js                | 11 +++++++++++
 js/bootstrap-button.js               | 11 +++++++++++
 js/bootstrap-carousel.js             | 10 ++++++++++
 js/bootstrap-collapse.js             | 17 ++++++++++++++---
 js/bootstrap-dropdown.js             | 11 +++++++++++
 js/bootstrap-modal.js                | 11 +++++++++++
 js/bootstrap-popover.js              | 13 ++++++++++++-
 js/bootstrap-scrollspy.js            | 11 +++++++++++
 js/bootstrap-tab.js                  | 11 +++++++++++
 js/bootstrap-tooltip.js              | 11 +++++++++++
 js/bootstrap-typeahead.js            | 13 ++++++++++++-
 js/tests/unit/bootstrap-affix.js     |  6 ++++++
 js/tests/unit/bootstrap-alert.js     |  6 ++++++
 js/tests/unit/bootstrap-button.js    |  6 ++++++
 js/tests/unit/bootstrap-carousel.js  |  6 ++++++
 js/tests/unit/bootstrap-collapse.js  |  6 ++++++
 js/tests/unit/bootstrap-dropdown.js  | 10 ++++++++--
 js/tests/unit/bootstrap-modal.js     |  6 ++++++
 js/tests/unit/bootstrap-popover.js   | 12 +++++++++---
 js/tests/unit/bootstrap-scrollspy.js |  6 ++++++
 js/tests/unit/bootstrap-tab.js       |  6 ++++++
 js/tests/unit/bootstrap-tooltip.js   |  6 ++++++
 js/tests/unit/bootstrap-typeahead.js |  6 ++++++
 24 files changed, 213 insertions(+), 10 deletions(-)

(limited to 'js')

diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js
index 18d4fc9ad..6020a19a5 100644
--- a/js/bootstrap-affix.js
+++ b/js/bootstrap-affix.js
@@ -68,6 +68,8 @@
  /* AFFIX PLUGIN DEFINITION
   * ======================= */
 
+  var old = $.fn.affix
+
   $.fn.affix = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -85,6 +87,15 @@
   }
 
 
+ /* AFFIX NO CONFLICT
+  * ================= */
+
+  $.fn.affix.noConflict = function () {
+    $.fn.affix = old
+    return this
+  }
+
+
  /* AFFIX DATA-API
   * ============== */
 
diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js
index dda647ec2..5bc026449 100644
--- a/js/bootstrap-alert.js
+++ b/js/bootstrap-alert.js
@@ -68,6 +68,8 @@
  /* ALERT PLUGIN DEFINITION
   * ======================= */
 
+  var old = $.fn.alert
+
   $.fn.alert = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -80,6 +82,15 @@
   $.fn.alert.Constructor = Alert
 
 
+ /* ALERT NO CONFLICT
+  * ================= */
+
+  $.fn.alert.noConflict = function () {
+    $.fn.alert = old
+    return this
+  }
+
+
  /* ALERT DATA-API
   * ============== */
 
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js
index 619423bbc..39b83399e 100644
--- a/js/bootstrap-button.js
+++ b/js/bootstrap-button.js
@@ -64,6 +64,8 @@
  /* BUTTON PLUGIN DEFINITION
   * ======================== */
 
+  var old = $.fn.button
+
   $.fn.button = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -82,6 +84,15 @@
   $.fn.button.Constructor = Button
 
 
+ /* BUTTON NO CONFLICT
+  * ================== */
+
+  $.fn.button.noConflict = function () {
+    $.fn.button = old
+    return this
+  }
+
+
  /* BUTTON DATA-API
   * =============== */
 
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 099b66930..ba26a5cd4 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -141,6 +141,8 @@
  /* CAROUSEL PLUGIN DEFINITION
   * ========================== */
 
+  var old = $.fn.carousel
+
   $.fn.carousel = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -162,6 +164,14 @@
   $.fn.carousel.Constructor = Carousel
 
 
+ /* CAROUSEL NO CONFLICT
+  * ==================== */
+
+  $.fn.carousel.noConflict = function () {
+    $.fn.carousel = old
+    return this
+  }
+
  /* CAROUSEL DATA-API
   * ================= */
 
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index a09ce1004..6ac0191a5 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -120,8 +120,10 @@
   }
 
 
- /* COLLAPSIBLE PLUGIN DEFINITION
-  * ============================== */
+ /* COLLAPSE PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.collapse
 
   $.fn.collapse = function (option) {
     return this.each(function () {
@@ -140,9 +142,18 @@
   $.fn.collapse.Constructor = Collapse
 
 
- /* COLLAPSIBLE DATA-API
+ /* COLLAPSE NO CONFLICT
   * ==================== */
 
+  $.fn.collapse.noConflict = function () {
+    $.fn.collapse = old
+    return this
+  }
+
+
+ /* COLLAPSE DATA-API
+  * ================= */
+
   $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
     var $this = $(this), href
       , target = $this.attr('data-target')
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
    * =================================== */
 
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 6fae36436..689a414ed 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -193,6 +193,8 @@
  /* MODAL PLUGIN DEFINITION
   * ======================= */
 
+  var old = $.fn.modal
+
   $.fn.modal = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -213,6 +215,15 @@
   $.fn.modal.Constructor = Modal
 
 
+ /* MODAL NO CONFLICT
+  * ================= */
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
  /* MODAL DATA-API
   * ============== */
 
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 56a63d4a2..1a4f532aa 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -81,6 +81,8 @@
  /* POPOVER PLUGIN DEFINITION
   * ======================= */
 
+  var old = $.fn.popover
+
   $.fn.popover = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -100,4 +102,13 @@
   , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>'
   })
 
-}(window.jQuery);
+
+ /* POPOVER NO CONFLICT
+  * =================== */
+
+  $.fn.popover.noConflict = function () {
+    $.fn.popover = old
+    return this
+  }
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
index 34f774868..fd82872c5 100644
--- a/js/bootstrap-scrollspy.js
+++ b/js/bootstrap-scrollspy.js
@@ -121,6 +121,8 @@
  /* SCROLLSPY PLUGIN DEFINITION
   * =========================== */
 
+  var old = $.fn.scrollspy
+
   $.fn.scrollspy = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -138,6 +140,15 @@
   }
 
 
+ /* SCROLLSPY NO CONFLICT
+  * ===================== */
+
+  $.fn.scrollspy.noConflict = function () {
+    $.fn.scrollspy = old
+    return this
+  }
+
+
  /* SCROLLSPY DATA-API
   * ================== */
 
diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js
index 059b39b35..84d4834a2 100644
--- a/js/bootstrap-tab.js
+++ b/js/bootstrap-tab.js
@@ -110,6 +110,8 @@
  /* TAB PLUGIN DEFINITION
   * ===================== */
 
+  var old = $.fn.tab
+
   $.fn.tab = function ( option ) {
     return this.each(function () {
       var $this = $(this)
@@ -122,6 +124,15 @@
   $.fn.tab.Constructor = Tab
 
 
+ /* TAB NO CONFLICT
+  * =============== */
+
+  $.fn.tab.noConflict = function () {
+    $.fn.tab = old
+    return this
+  }
+
+
  /* TAB DATA-API
   * ============ */
 
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index b3325b238..a08952a4c 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -250,6 +250,8 @@
  /* TOOLTIP PLUGIN DEFINITION
   * ========================= */
 
+  var old = $.fn.tooltip
+
   $.fn.tooltip = function ( option ) {
     return this.each(function () {
       var $this = $(this)
@@ -273,4 +275,13 @@
   , html: false
   }
 
+
+ /* TOOLTIP NO CONFLICT
+  * =================== */
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  }
+
 }(window.jQuery);
\ No newline at end of file
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 512d91acb..9b123fb3f 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -276,6 +276,8 @@
   /* TYPEAHEAD PLUGIN DEFINITION
    * =========================== */
 
+  var old = $.fn.typeahead
+
   $.fn.typeahead = function (option) {
     return this.each(function () {
       var $this = $(this)
@@ -297,7 +299,16 @@
   $.fn.typeahead.Constructor = Typeahead
 
 
- /*   TYPEAHEAD DATA-API
+ /* TYPEAHEAD NO CONFLICT
+  * =================== */
+
+  $.fn.typeahead.noConflict = function () {
+    $.fn.typeahead = old
+    return this
+  }
+
+
+ /* TYPEAHEAD DATA-API
   * ================== */
 
   $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
diff --git a/js/tests/unit/bootstrap-affix.js b/js/tests/unit/bootstrap-affix.js
index bc25df991..c97887890 100644
--- a/js/tests/unit/bootstrap-affix.js
+++ b/js/tests/unit/bootstrap-affix.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-affix")
 
+      test("should provide no conflict", function () {
+        var affix = $.fn.affix.noConflict()
+        ok(!$.fn.affix, 'affix was set back to undefined (org value)')
+        $.fn.affix = affix
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).affix, 'affix method is defined')
       })
diff --git a/js/tests/unit/bootstrap-alert.js b/js/tests/unit/bootstrap-alert.js
index 7f24e0e6b..9a6b514c4 100644
--- a/js/tests/unit/bootstrap-alert.js
+++ b/js/tests/unit/bootstrap-alert.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-alerts")
 
+      test("should provide no conflict", function () {
+        var alert = $.fn.alert.noConflict()
+        ok(!$.fn.alert, 'alert was set back to undefined (org value)')
+        $.fn.alert = alert
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).alert, 'alert method is defined')
       })
diff --git a/js/tests/unit/bootstrap-button.js b/js/tests/unit/bootstrap-button.js
index b5d083499..e23ff9e30 100644
--- a/js/tests/unit/bootstrap-button.js
+++ b/js/tests/unit/bootstrap-button.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-buttons")
 
+      test("should provide no conflict", function () {
+        var button = $.fn.button.noConflict()
+        ok(!$.fn.button, 'button was set back to undefined (org value)')
+        $.fn.button = button
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).button, 'button method is defined')
       })
diff --git a/js/tests/unit/bootstrap-carousel.js b/js/tests/unit/bootstrap-carousel.js
index 8bd1b62ba..13b8f721f 100644
--- a/js/tests/unit/bootstrap-carousel.js
+++ b/js/tests/unit/bootstrap-carousel.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-carousel")
 
+      test("should provide no conflict", function () {
+        var carousel = $.fn.carousel.noConflict()
+        ok(!$.fn.carousel, 'carousel was set back to undefined (org value)')
+        $.fn.carousel = carousel
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).carousel, 'carousel method is defined')
       })
diff --git a/js/tests/unit/bootstrap-collapse.js b/js/tests/unit/bootstrap-collapse.js
index 6cc7ac7a4..4c5916ecd 100644
--- a/js/tests/unit/bootstrap-collapse.js
+++ b/js/tests/unit/bootstrap-collapse.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-collapse")
 
+      test("should provide no conflict", function () {
+        var collapse = $.fn.collapse.noConflict()
+        ok(!$.fn.collapse, 'collapse was set back to undefined (org value)')
+        $.fn.collapse = collapse
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).collapse, 'collapse method is defined')
       })
diff --git a/js/tests/unit/bootstrap-dropdown.js b/js/tests/unit/bootstrap-dropdown.js
index 3788209ec..2f0d2d29e 100644
--- a/js/tests/unit/bootstrap-dropdown.js
+++ b/js/tests/unit/bootstrap-dropdown.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-dropdowns")
 
+      test("should provide no conflict", function () {
+        var dropdown = $.fn.dropdown.noConflict()
+        ok(!$.fn.dropdown, 'dropdown was set back to undefined (org value)')
+        $.fn.dropdown = dropdown
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).dropdown, 'dropdown method is defined')
       })
@@ -104,7 +110,7 @@ $(function () {
       })
 
       test("should remove open class if body clicked, with multiple drop downs", function () {
-          var dropdownHTML = 
+          var dropdownHTML =
             '<ul class="nav">'
             + '    <li><a href="#menu1">Menu 1</a></li>'
             + '    <li class="dropdown" id="testmenu">'
@@ -126,7 +132,7 @@ $(function () {
           , last = dropdowns.last()
 
         ok(dropdowns.length == 2, "Should be two dropdowns")
-          
+
         first.click()
         ok(first.parents('.open').length == 1, 'open class added on click')
         ok($('#qunit-fixture .open').length == 1, 'only one object is open')
diff --git a/js/tests/unit/bootstrap-modal.js b/js/tests/unit/bootstrap-modal.js
index 0851f64a7..98aa990a6 100644
--- a/js/tests/unit/bootstrap-modal.js
+++ b/js/tests/unit/bootstrap-modal.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-modal")
 
+      test("should provide no conflict", function () {
+        var modal = $.fn.modal.noConflict()
+        ok(!$.fn.modal, 'modal was set back to undefined (org value)')
+        $.fn.modal = modal
+      })
+
       test("should be defined on jquery object", function () {
         var div = $("<div id='modal-test'></div>")
         ok(div.modal, 'modal method is defined')
diff --git a/js/tests/unit/bootstrap-popover.js b/js/tests/unit/bootstrap-popover.js
index 6a5f0bdcf..20234e147 100644
--- a/js/tests/unit/bootstrap-popover.js
+++ b/js/tests/unit/bootstrap-popover.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-popover")
 
+      test("should provide no conflict", function () {
+        var popover = $.fn.popover.noConflict()
+        ok(!$.fn.popover, 'popover was set back to undefined (org value)')
+        $.fn.popover = popover
+      })
+
       test("should be defined on jquery object", function () {
         var div = $('<div></div>')
         ok(div.popover, 'popover method is defined')
@@ -70,7 +76,7 @@ $(function () {
         ok(!$('.popover').length, 'popover was removed')
         $('#qunit-fixture').empty()
       })
-    
+
       test("should respect custom classes", function() {
         $.support.transition = false
         var popover = $('<a href="#">@fat</a>')
@@ -80,7 +86,7 @@ $(function () {
           , content: 'Test'
           , template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
           })
-        
+
         popover.popover('show')
 
         ok($('.popover').length, 'popover was inserted')
@@ -103,5 +109,5 @@ $(function () {
         ok($._data(popover[0],'events').click[0].namespace == 'foo', 'popover still has click.foo')
         ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events')
       })
-      
+
 })
\ No newline at end of file
diff --git a/js/tests/unit/bootstrap-scrollspy.js b/js/tests/unit/bootstrap-scrollspy.js
index bee46a925..32bfa7134 100644
--- a/js/tests/unit/bootstrap-scrollspy.js
+++ b/js/tests/unit/bootstrap-scrollspy.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-scrollspy")
 
+      test("should provide no conflict", function () {
+        var scrollspy = $.fn.scrollspy.noConflict()
+        ok(!$.fn.scrollspy, 'scrollspy was set back to undefined (org value)')
+        $.fn.scrollspy = scrollspy
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).scrollspy, 'scrollspy method is defined')
       })
diff --git a/js/tests/unit/bootstrap-tab.js b/js/tests/unit/bootstrap-tab.js
index 40f9a7406..ba5910d5e 100644
--- a/js/tests/unit/bootstrap-tab.js
+++ b/js/tests/unit/bootstrap-tab.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-tabs")
 
+      test("should provide no conflict", function () {
+        var tab = $.fn.tab.noConflict()
+        ok(!$.fn.tab, 'tab was set back to undefined (org value)')
+        $.fn.tab = tab
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).tab, 'tabs method is defined')
       })
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
index bbdf3ce80..ba5134743 100644
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-tooltip")
 
+      test("should provide no conflict", function () {
+        var tooltip = $.fn.tooltip.noConflict()
+        ok(!$.fn.tooltip, 'tooltip was set back to undefined (org value)')
+        $.fn.tooltip = tooltip
+      })
+
       test("should be defined on jquery object", function () {
         var div = $("<div></div>")
         ok(div.tooltip, 'popover method is defined')
diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
index 16bdb9194..0f7aed27d 100644
--- a/js/tests/unit/bootstrap-typeahead.js
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -2,6 +2,12 @@ $(function () {
 
     module("bootstrap-typeahead")
 
+      test("should provide no conflict", function () {
+        var typeahead = $.fn.typeahead.noConflict()
+        ok(!$.fn.typeahead, 'typeahead was set back to undefined (org value)')
+        $.fn.typeahead = typeahead
+      })
+
       test("should be defined on jquery object", function () {
         ok($(document.body).typeahead, 'alert method is defined')
       })
-- 
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')

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 91fbadad5b058f160eb3b5eb8e88432e0088efee Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 7 Dec 2012 17:49:05 -0500
Subject: remove slide from carousel constructor #5579

---
 js/bootstrap-carousel.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'js')

diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index ba26a5cd4..238ff4280 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -29,7 +29,6 @@
   var Carousel = function (element, options) {
     this.$element = $(element)
     this.options = options
-    this.options.slide && this.slide(this.options.slide)
     this.options.pause == 'hover' && this.$element
       .on('mouseenter', $.proxy(this.pause, this))
       .on('mouseleave', $.proxy(this.cycle, this))
-- 
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')

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


From 1747caf19d59cad7fdc90ae56a00e0e2849f95f4 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 7 Dec 2012 18:59:13 -0500
Subject: insert menu of typeahead after input which it suggests on #3529
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
---
 js/bootstrap-typeahead.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 387fd2a6d..3c9153c9b 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -33,7 +33,7 @@
     this.sorter = this.options.sorter || this.sorter
     this.highlighter = this.options.highlighter || this.highlighter
     this.updater = this.options.updater || this.updater
-    this.$menu = $(this.options.menu).appendTo('body')
+    this.$menu = $(this.options.menu).insertAfter(this.$element)
     this.source = this.options.source
     this.shown = false
     this.listen()
@@ -56,7 +56,7 @@
     }
 
   , show: function () {
-      var pos = $.extend({}, this.$element.offset(), {
+      var pos = $.extend({}, this.$element.position(), {
         height: this.$element[0].offsetHeight
       })
 
-- 
cgit v1.2.3


From 820a3b27b6cfd320584be5a8e1652c7dff9771e4 Mon Sep 17 00:00:00 2001
From: fat <jacobthornton@gmail.com>
Date: Fri, 7 Dec 2012 19:16:48 -0500
Subject: get tests passing for typeahead :P

---
 js/bootstrap-typeahead.js            | 14 ++++++++------
 js/tests/unit/bootstrap-typeahead.js | 27 ++++++++++++++++++---------
 2 files changed, 26 insertions(+), 15 deletions(-)

(limited to 'js')

diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 3c9153c9b..088e7ce9b 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -33,8 +33,8 @@
     this.sorter = this.options.sorter || this.sorter
     this.highlighter = this.options.highlighter || this.highlighter
     this.updater = this.options.updater || this.updater
-    this.$menu = $(this.options.menu).insertAfter(this.$element)
     this.source = this.options.source
+    this.$menu = $(this.options.menu)
     this.shown = false
     this.listen()
   }
@@ -60,12 +60,14 @@
         height: this.$element[0].offsetHeight
       })
 
-      this.$menu.css({
-        top: pos.top + pos.height
-      , left: pos.left
-      })
+      this.$menu
+        .insertAfter(this.$element)
+        .css({
+          top: pos.top + pos.height
+        , left: pos.left
+        })
+        .show()
 
-      this.$menu.show()
       this.shown = true
       return this
     }
diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
index 0cf26b315..4bdbce970 100644
--- a/js/tests/unit/bootstrap-typeahead.js
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -38,7 +38,9 @@ $(function () {
       })
 
       test("should show menu when query entered", function () {
-        var $input = $('<input />').typeahead({
+        var $input = $('<input />')
+            .appendTo('body')
+            .typeahead({
               source: ['aa', 'ab', 'ac']
             })
           , typeahead = $input.data('typeahead')
@@ -50,6 +52,7 @@ $(function () {
         equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -58,7 +61,7 @@ $(function () {
               source: function () {
                 return ['aa', 'ab', 'ac']
               }
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('a')
@@ -68,6 +71,7 @@ $(function () {
         equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -76,7 +80,7 @@ $(function () {
               source: function (query, process) {
                 process(['aa', 'ab', 'ac'])
               }
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('a')
@@ -86,13 +90,14 @@ $(function () {
         equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
       test("should not explode when regex chars are entered", function () {
         var $input = $('<input />').typeahead({
               source: ['aa', 'ab', 'ac', 'mdo*', 'fat+']
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('+')
@@ -102,6 +107,7 @@ $(function () {
         equals(typeahead.$menu.find('li').length, 1, 'has 1 item in menu')
         equals(typeahead.$menu.find('.active').length, 1, 'one item is active')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -109,7 +115,7 @@ $(function () {
         stop()
         var $input = $('<input />').typeahead({
               source: ['aa', 'ab', 'ac']
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('a')
@@ -126,13 +132,14 @@ $(function () {
           start()
         }, 200)
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
       test("should set next item when down arrow is pressed", function () {
         var $input = $('<input />').typeahead({
               source: ['aa', 'ab', 'ac']
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('a')
@@ -159,7 +166,6 @@ $(function () {
 
         ok(typeahead.$menu.find('li').first().next().hasClass('active'), "second item is active")
 
-
         $input.trigger({
           type: 'keydown'
         , keyCode: 38
@@ -175,6 +181,7 @@ $(function () {
 
         ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active")
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -182,7 +189,7 @@ $(function () {
       test("should set input value to selected item", function () {
         var $input = $('<input />').typeahead({
               source: ['aa', 'ab', 'ac']
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
           , changed = false
 
@@ -197,6 +204,7 @@ $(function () {
         ok(!typeahead.$menu.is(':visible'), 'the menu was hidden')
         ok(changed, 'a change event was fired')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 
@@ -204,7 +212,7 @@ $(function () {
         var $input = $('<input />').typeahead({
               source: ['aaaa', 'aaab', 'aaac'],
               minLength: 3
-            })
+            }).appendTo('body')
           , typeahead = $input.data('typeahead')
 
         $input.val('aa')
@@ -217,6 +225,7 @@ $(function () {
 
         equals(typeahead.$menu.find('li').length, 3, 'has 3 items in menu')
 
+        $input.remove()
         typeahead.$menu.remove()
       })
 })
-- 
cgit v1.2.3