diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-05-14 11:52:47 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-05-14 11:52:47 +0200 |
| commit | c6a8d7ee3c9803d9944db6f55778810592a36452 (patch) | |
| tree | abb3df79a0eb6d9bb4713ab73da8ddc60d8a7674 /tests/unit/dialog/dialog.html | |
| parent | 41dfb09aeb5df7d53089b58959d21207de63edbe (diff) | |
| parent | d393c8b4cb26ec34878c22202da6ba9393e0094d (diff) | |
| download | jquery-ui-c6a8d7ee3c9803d9944db6f55778810592a36452.tar.gz jquery-ui-c6a8d7ee3c9803d9944db6f55778810592a36452.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'tests/unit/dialog/dialog.html')
| -rw-r--r-- | tests/unit/dialog/dialog.html | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index 94b20a225..d804807f2 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -6,9 +6,12 @@ <script src="../../jquery.js"></script> <script src="../../../external/jquery.bgiframe-2.1.2.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", "ui.dialog" ], js: [ "ui/jquery.ui.core.js", @@ -22,13 +25,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="dialog_common.js"></script> <script src="dialog_core.js"></script> - <script src="dialog_defaults.js"></script> <script src="dialog_events.js"></script> <script src="dialog_methods.js"></script> <script src="dialog_options.js"></script> |