diff options
| author | kborchers <kris.borchers@gmail.com> | 2011-12-01 12:53:35 -0600 |
|---|---|---|
| committer | kborchers <kris.borchers@gmail.com> | 2011-12-01 12:53:35 -0600 |
| commit | 490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9 (patch) | |
| tree | e65043eb657d9232888dcc1435bdd6907f990d15 /tests/unit/tooltip | |
| parent | e206e549352684a4c30ad53e38c5544599328f2d (diff) | |
| parent | ce7918fc73c161ab237f052bad070e34250526be (diff) | |
| download | jquery-ui-490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9.tar.gz jquery-ui-490dc4d36b6a0bf1dac5d8a9ba86aef7c9c27ee9.zip | |
Merge branch 'master' into menubar_otherStructures
Diffstat (limited to 'tests/unit/tooltip')
| -rw-r--r-- | tests/unit/tooltip/all.html | 2 | ||||
| -rw-r--r-- | tests/unit/tooltip/tooltip.html | 18 | ||||
| -rw-r--r-- | tests/unit/tooltip/tooltip_events.js | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html index d2913c43f..0ef6e090e 100644 --- a/tests/unit/tooltip/all.html +++ b/tests/unit/tooltip/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Tooltip Test Suite</title> - <script src="../../../jquery-1.6.4.js"></script> + <script src="../../../jquery-1.7.1.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../subsuiteRunner.css"> diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html index 82070fbfd..b5e8558e5 100644 --- a/tests/unit/tooltip/tooltip.html +++ b/tests/unit/tooltip/tooltip.html @@ -4,13 +4,19 @@ <meta charset="utf-8"> <title>jQuery UI Tooltip Test Suite</title> - <link rel="stylesheet" href="../../../themes/base/jquery.ui.tooltip.css"> - <script src="../../jquery.js"></script> - <script src="../../../ui/jquery.ui.core.js"></script> - <script src="../../../ui/jquery.ui.widget.js"></script> - <script src="../../../ui/jquery.ui.position.js"></script> - <script src="../../../ui/jquery.ui.tooltip.js"></script> + <script src="../../resource_loader.js"></script> + <script> + loadResources({ + css: [ "ui.core", "ui.tooltip" ], + js: [ + "ui/jquery.ui.core.js", + "ui/jquery.ui.widget.js", + "ui/jquery.ui.position.js", + "ui/jquery.ui.tooltip.js" + ] + }); + </script> <link rel="stylesheet" href="../../../external/qunit.css"> <script src="../../../external/qunit.js"></script> diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js index 963acaf59..99e1fbd79 100644 --- a/tests/unit/tooltip/tooltip_events.js +++ b/tests/unit/tooltip/tooltip_events.js @@ -59,7 +59,7 @@ asyncTest( "mixed events", function() { element.one( "tooltipopen", function( event ) { same( event.originalEvent.type, "focusin" ); }); - element[0].focus(); + element.simulate( "focus" ); element.one( "tooltipopen", function() { ok( false, "open triggered while already open" ); @@ -77,7 +77,7 @@ asyncTest( "mixed events", function() { same( event.originalEvent.type, "blur" ); start(); }); - element[0].blur(); + element.simulate( "blur" ); }); }( jQuery ) ); |