diff options
| author | Mark Otto <[email protected]> | 2012-04-14 17:16:37 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-14 17:16:37 -0700 |
| commit | ce30d19c1507e71199f7dbbf680cf0d2b0ea6477 (patch) | |
| tree | 1279731abc8cf141a3fd683282ad2cae32ae6653 /js/tests/unit | |
| parent | dbde2dc9e40f077af4fcaa1714ade7bc94398da9 (diff) | |
| parent | 3408064d00bc1e4322c3ea1575bc2cab5aaa2be2 (diff) | |
| download | bootstrap-ce30d19c1507e71199f7dbbf680cf0d2b0ea6477.tar.xz bootstrap-ce30d19c1507e71199f7dbbf680cf0d2b0ea6477.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'js/tests/unit')
| -rw-r--r-- | js/tests/unit/bootstrap-transition.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/bootstrap-typeahead.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/js/tests/unit/bootstrap-transition.js b/js/tests/unit/bootstrap-transition.js index 3f28d2676..086773fa2 100644 --- a/js/tests/unit/bootstrap-transition.js +++ b/js/tests/unit/bootstrap-transition.js @@ -3,7 +3,7 @@ $(function () { module("bootstrap-transition") test("should be defined on jquery support object", function () { - ok($.support.transition != undefined, 'transition object is defined') + ok($.support.transition !== undefined, 'transition object is defined') }) test("should provide an end object", function () { diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js index 25d313c85..4e2428d6a 100644 --- a/js/tests/unit/bootstrap-typeahead.js +++ b/js/tests/unit/bootstrap-typeahead.js @@ -107,7 +107,7 @@ $(function () { ok(typeahead.$menu.find('li').first().hasClass('active'), "first item is active") $input.trigger({ - type: 'keypress' + type: 'keydown' , keyCode: 40 }) @@ -115,7 +115,7 @@ $(function () { $input.trigger({ - type: 'keypress' + type: 'keydown' , keyCode: 38 }) |