diff options
author | jzaefferer <joern.zaefferer@gmail.com> | 2010-04-21 20:06:56 +0200 |
---|---|---|
committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-04-21 20:06:56 +0200 |
commit | cfa185d962a153aa50c1ec991f37a24d222abce2 (patch) | |
tree | 5f747e161a57dbbd2776a4eae68df7d305ecbf03 /tests/unit/dialog/dialog.html | |
parent | 19b76a14a85c000996e22a6377ff86dc931bbc1e (diff) | |
parent | 469d0c52e93fe9e421877eec90489cc06d63e5e5 (diff) | |
download | jquery-ui-cfa185d962a153aa50c1ec991f37a24d222abce2.tar.gz jquery-ui-cfa185d962a153aa50c1ec991f37a24d222abce2.zip |
Merge commit '1.8.1' into tooltip
Diffstat (limited to 'tests/unit/dialog/dialog.html')
-rw-r--r-- | tests/unit/dialog/dialog.html | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index 03ce280e3..97a5d44cd 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -19,7 +19,6 @@ <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> - <script type="text/javascript" src="../testsuite.js"></script> <script type="text/javascript" src="dialog_core.js"></script> <script type="text/javascript" src="dialog_defaults.js"></script> @@ -27,6 +26,18 @@ <script type="text/javascript" src="dialog_methods.js"></script> <script type="text/javascript" src="dialog_options.js"></script> <script type="text/javascript" src="dialog_tickets.js"></script> + + <script type="text/javascript"> + // disable this stale testsuite for testswarm only + var url = window.location.search; + url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + 9 ) ); + if ( url && url.indexOf("http") == 0 ) { + // reset config to kill previous tests; make sure testsuite.js is loaded afterwards to init the testswarm script + QUnit.init(); + test("dialog", function() { ok(true, "disabled dialog testsuite"); }); + } + </script> + <script type="text/javascript" src="../testsuite.js"></script> </head> <body> |