diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
| commit | 0f575e03bb9af0b09d18a9207d9f589e05f44d50 (patch) | |
| tree | 18251a2d3e7c51adb8f265158ca0361f5cca73d1 /tests/unit/draggable/draggable.html | |
| parent | af1576280a807dcc166ddf619abab1fc24cac664 (diff) | |
| parent | 9df981d268b4029065247cf230a4e988946b7799 (diff) | |
| download | jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.tar.gz jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.zip | |
Merge branch 'master' into position-notification
Conflicts:
tests/unit/position/position_core_within.js
Diffstat (limited to 'tests/unit/draggable/draggable.html')
| -rw-r--r-- | tests/unit/draggable/draggable.html | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html index 5be71f460..09bc191c9 100644 --- a/tests/unit/draggable/draggable.html +++ b/tests/unit/draggable/draggable.html @@ -5,9 +5,12 @@ <title>jQuery UI Draggable Test Suite</title> <script src="../../jquery.js"></script> - <script src="../../resource_loader.js"></script> + <link rel="stylesheet" href="../../../external/qunit.css"> + <script src="../../../external/qunit.js"></script> + <script src="../../jquery.simulate.js"></script> + <script src="../testsuite.js"></script> <script> - loadResources({ + TestHelpers.loadResources({ css: [ "ui.core" ], js: [ "ui/jquery.ui.core.js", @@ -18,13 +21,8 @@ }); </script> - <link rel="stylesheet" href="../../../external/qunit.css"> - <script src="../../../external/qunit.js"></script> - <script src="../../jquery.simulate.js"></script> - <script src="../testsuite.js"></script> - + <script src="draggable_common.js"></script> <script src="draggable_core.js"></script> - <script src="draggable_defaults.js"></script> <script src="draggable_events.js"></script> <script src="draggable_methods.js"></script> <script src="draggable_options.js"></script> |