From: fat <jacobthornton@gmail.com>
Date: Sat, 22 Dec 2012 01:19:36 +0000 (-0800)
Subject: Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel... 
X-Git-Tag: v2.3.0^2~69^2~3^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d5345f806c7e8cd25494967bd371aef7a3fc4a63;p=thirdparty%2Fbootstrap.git

Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master
---

d5345f806c7e8cd25494967bd371aef7a3fc4a63
diff --cc js/tests/unit/bootstrap-typeahead.js
index 4bdbce9709,5e1183609a..0aa2d61b17
--- a/js/tests/unit/bootstrap-typeahead.js
+++ b/js/tests/unit/bootstrap-typeahead.js
@@@ -189,9 -159,11 +189,11 @@@ $(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
+           , focus = false
+           , blur = false
  
          $input.val('a')
          typeahead.lookup()
@@@ -203,8 -177,8 +207,9 @@@
          equals($input.val(), 'ac', 'input value was correctly set')
          ok(!typeahead.$menu.is(':visible'), 'the menu was hidden')
          ok(changed, 'a change event was fired')
+         ok(focus && !blur, 'focus is still set')
  
 +        $input.remove()
          typeahead.$menu.remove()
        })