diff options
| -rw-r--r-- | demos/functional/datepicker/debug.html | 4 | ||||
| -rw-r--r-- | demos/functional/datepicker/index.html | 4 | ||||
| -rw-r--r-- | demos/real-world/accordion-drawers/index.html | 6 | ||||
| -rw-r--r-- | demos/real-world/effects/index.html | 2 | ||||
| -rw-r--r-- | demos/real-world/image-cropper/index.html | 8 | ||||
| -rw-r--r-- | demos/real-world/layout/index.html | 10 | ||||
| -rw-r--r-- | demos/real-world/photo-manager/index.html | 8 | ||||
| -rw-r--r-- | demos/real-world/product-slider/index.html | 6 | ||||
| -rw-r--r-- | demos/real-world/range-interface/index.html | 6 | ||||
| -rw-r--r-- | demos/real-world/splitpane/index.html | 6 | ||||
| -rw-r--r-- | tests/accordion.html | 13 | ||||
| -rw-r--r-- | tests/all.html | 37 | ||||
| -rw-r--r-- | tests/autodrag.html | 11 | ||||
| -rw-r--r-- | tests/draggable.html | 45 | ||||
| -rw-r--r-- | tests/draggable.js | 8 | ||||
| -rw-r--r-- | tests/resizable.html | 23 | ||||
| -rw-r--r-- | tests/resizable.js | 8 | ||||
| -rw-r--r-- | tests/slider.html | 24 |
18 files changed, 128 insertions, 101 deletions
diff --git a/demos/functional/datepicker/debug.html b/demos/functional/datepicker/debug.html index 91dab145b..526c0557e 100644 --- a/demos/functional/datepicker/debug.html +++ b/demos/functional/datepicker/debug.html @@ -7,10 +7,10 @@ <input type="text" name="testing" value="click" id="testing" /> <!-- Include jQuery --> - <script src="../../../../jquery/jquery-1.2.6.js" type="text/javascript" charset="utf-8"></script> + <script src="../../../jquery-1.2.6.js" type="text/javascript" charset="utf-8"></script> <!-- Include UI Datepicker --> - <script src="../../../source/ui.datepicker.js" type="text/javascript" charset="utf-8"></script> + <script src="../../ui/ui.datepicker.js" type="text/javascript" charset="utf-8"></script> <script type="text/javascript" charset="utf-8"> $(function(){ diff --git a/demos/functional/datepicker/index.html b/demos/functional/datepicker/index.html index 4b28d7e3a..ad508b7dd 100644 --- a/demos/functional/datepicker/index.html +++ b/demos/functional/datepicker/index.html @@ -873,10 +873,10 @@ $('inputs').<b>datepicker('change',</b> ...);</code></pre> </ul> <!-- Include jQuery --> - <script src="../../../../jquery/jquery-1.2.6.js" type="text/javascript" charset="utf-8"></script> + <script src="../../../jquery-1.2.6.js" type="text/javascript" charset="utf-8"></script> <!-- Include UI Datepicker --> - <script src="../../../source/ui.datepicker.js" type="text/javascript" charset="utf-8"></script> + <script src="../../ui/ui.datepicker.js" type="text/javascript" charset="utf-8"></script> <!-- Include Demo Files --> <script type="text/javascript" src="demo/jquery.localisation.js"></script> diff --git a/demos/real-world/accordion-drawers/index.html b/demos/real-world/accordion-drawers/index.html index 80c4df95d..4035ac7dd 100644 --- a/demos/real-world/accordion-drawers/index.html +++ b/demos/real-world/accordion-drawers/index.html @@ -149,10 +149,10 @@ blockquote, q { --> </style> - <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script> + <script type="text/javascript" src="../../../jquery-1.2.6.js"></script> - <script type="text/javascript" src="../../../source/ui.core.js"></script> - <script type="text/javascript" src="../../../source/ui.accordion.js"></script> + <script type="text/javascript" src="../../ui/ui.core.js"></script> + <script type="text/javascript" src="../../ui/ui.accordion.js"></script> <script type="text/javascript"> diff --git a/demos/real-world/effects/index.html b/demos/real-world/effects/index.html index 15ebbece2..81a451c85 100644 --- a/demos/real-world/effects/index.html +++ b/demos/real-world/effects/index.html @@ -6,7 +6,7 @@ <title>Effects Test Suite</title> <link rel="stylesheet" href="style.css" type="text/css" media="screen" title="no title" charset="utf-8" /> - <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script> + <script type="text/javascript" src="../../../jquery-1.2.6.js"></script> <script type="text/javascript" src="../../../source/effects.core.js"></script> <script type="text/javascript" src="../../../source/effects.blind.js"></script> diff --git a/demos/real-world/image-cropper/index.html b/demos/real-world/image-cropper/index.html index afa85ae3c..9cce4f120 100644 --- a/demos/real-world/image-cropper/index.html +++ b/demos/real-world/image-cropper/index.html @@ -4,10 +4,10 @@ <meta http-equiv="Content-Language" content="en" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>Image Cropper: jQuery Real-world Demo</title> -<script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script> -<script type="text/javascript" src="../../../source/ui.core.js"></script> -<script type="text/javascript" src="../../../source/ui.resizable.js"></script> -<script type="text/javascript" src="../../../source/ui.draggable.js"></script> +<script type="text/javascript" src="../../../jquery-1.2.6.js"></script> +<script type="text/javascript" src="../../ui/ui.core.js"></script> +<script type="text/javascript" src="../../ui/ui.resizable.js"></script> +<script type="text/javascript" src="../../ui/ui.draggable.js"></script> <script type="text/javascript" src="../../../source/effects.core.js"></script> <script type="text/javascript" src="../../../source/effects.bounce.js"></script> diff --git a/demos/real-world/layout/index.html b/demos/real-world/layout/index.html index 83f9d0378..1e25909f5 100644 --- a/demos/real-world/layout/index.html +++ b/demos/real-world/layout/index.html @@ -77,15 +77,15 @@ </div> <!-- jQuery Core --> - <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script> + <script type="text/javascript" src="../../../jquery-1.2.6.js"></script> <!-- jQuery UI Base --> - <script type="text/javascript" src="../../../source/ui.core.js"></script> + <script type="text/javascript" src="../../ui/ui.core.js"></script> <!-- jQuery UI Plugins --> - <script type="text/javascript" src="../../../source/ui.draggable.js"></script> - <script type="text/javascript" src="../../../source/ui.droppable.js"></script> - <script type="text/javascript" src="../../../source/ui.sortable.js"></script> + <script type="text/javascript" src="../../ui/ui.draggable.js"></script> + <script type="text/javascript" src="../../ui/ui.droppable.js"></script> + <script type="text/javascript" src="../../ui/ui.sortable.js"></script> <!-- jQuery UI Demo --> diff --git a/demos/real-world/photo-manager/index.html b/demos/real-world/photo-manager/index.html index ecc9a5500..1b3b6374b 100644 --- a/demos/real-world/photo-manager/index.html +++ b/demos/real-world/photo-manager/index.html @@ -8,13 +8,13 @@ <meta name="keywords" content="jquery, ui, droppables, draggables, demo" /> <meta name="description" content="Demonstration of jQuery UI Droppables and Dragables. More to come." /> - <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script> + <script type="text/javascript" src="../../../jquery-1.2.6.js"></script> <script type="text/javascript" src="js/jquery.livequery.js"></script> <script type="text/javascript" src="js/jquery.blockUI.js"></script> - <script type="text/javascript" src="../../../source/ui.core.js"></script> - <script type="text/javascript" src="../../../source/ui.draggable.js"></script> - <script type="text/javascript" src="../../../source/ui.droppable.js"></script> + <script type="text/javascript" src="../../ui/ui.core.js"></script> + <script type="text/javascript" src="../../ui/ui.draggable.js"></script> + <script type="text/javascript" src="../../ui/ui.droppable.js"></script> <script type="text/javascript" src="./js/demo.js"></script> diff --git a/demos/real-world/product-slider/index.html b/demos/real-world/product-slider/index.html index 07cae0de7..59cece8e0 100644 --- a/demos/real-world/product-slider/index.html +++ b/demos/real-world/product-slider/index.html @@ -98,9 +98,9 @@ --> </style> - <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script> - <script type="text/javascript" src="../../../source/ui.core.js"></script> - <script type="text/javascript" src="../../../source/ui.slider.js"></script> + <script type="text/javascript" src="../../../jquery-1.2.6.js"></script> + <script type="text/javascript" src="../../ui/ui.core.js"></script> + <script type="text/javascript" src="../../ui/ui.slider.js"></script> <script type="text/javascript" charset="utf-8"> /** diff --git a/demos/real-world/range-interface/index.html b/demos/real-world/range-interface/index.html index bb8554fa3..baaaa901c 100644 --- a/demos/real-world/range-interface/index.html +++ b/demos/real-world/range-interface/index.html @@ -4,10 +4,10 @@ <meta http-equiv="Content-Language" content="en" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>Slider Test Page</title> -<script src="../../../../jquery/jquery-1.2.6.js" type="text/javascript" charset="utf-8"></script> +<script src="../../../jquery-1.2.6.js" type="text/javascript" charset="utf-8"></script> <link rel="stylesheet" href="../../../themes/flora/flora.all.css" type="text/css" media="screen" title="no title" charset="utf-8"> -<script src="../../../source/ui.core.js" type="text/javascript" charset="utf-8"></script> -<script src="../../../source/ui.slider.js" type="text/javascript" charset="utf-8"></script> +<script src="../../ui/ui.core.js" type="text/javascript" charset="utf-8"></script> +<script src="../../ui/ui.slider.js" type="text/javascript" charset="utf-8"></script> <script src="../../../source/effects.core.js" type="text/javascript" charset="utf-8"></script> <script src="../../../source/effects.blind.js" type="text/javascript" charset="utf-8"></script> <script src="../../../source/effects.bounce.js" type="text/javascript" charset="utf-8"></script> diff --git a/demos/real-world/splitpane/index.html b/demos/real-world/splitpane/index.html index 2800b206f..033cf2ffc 100644 --- a/demos/real-world/splitpane/index.html +++ b/demos/real-world/splitpane/index.html @@ -6,11 +6,11 @@ <title>jQuery UI: SplitPane</title> <!-- jQuery --> - <script type="text/javascript" src="../../../../jquery/jquery-1.2.6.js"></script> + <script type="text/javascript" src="../../../jquery-1.2.6.js"></script> <!-- jQuery UI --> - <script type="text/javascript" src="../../../source/ui.core.js"></script> - <script type="text/javascript" src="../../../source/ui.resizable.js"></script> + <script type="text/javascript" src="../../ui/ui.core.js"></script> + <script type="text/javascript" src="../../ui/ui.resizable.js"></script> <script src="js/demo.js" type="text/javascript" charset="utf-8"></script> diff --git a/tests/accordion.html b/tests/accordion.html index 66913ba2b..a4f7c1682 100644 --- a/tests/accordion.html +++ b/tests/accordion.html @@ -3,15 +3,16 @@ <head> <title>jQuery UI Accordion Test Suite</title> - <link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen"> - <script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script> - - <script type="text/javascript" src="../source/ui.core.js"></script> - <script type="text/javascript" src="../source/ui.accordion.js"></script> + <link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen"> + + <script type="text/javascript" src="../jquery-1.2.6.js"></script> + <script type="text/javascript" src="../ui/ui.core.js"></script> + <script type="text/javascript" src="../ui/ui.accordion.js"></script> - <script type="text/javascript" src="../../qunit/testrunner.js"></script> + <script type="text/javascript" src="qunit/testrunner.js"></script> <script type="text/javascript" src="accordion.js"></script> + <style type="text/css"> .xerror, .error { display: none } </style> diff --git a/tests/all.html b/tests/all.html index 82000437d..256996b7f 100644 --- a/tests/all.html +++ b/tests/all.html @@ -2,17 +2,35 @@ <html lang="en"> <head> <title>jQuery UI All Tests</title> - <link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen"> - <script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script> - - <script type="text/javascript" src="../source/ui.core.js"></script> - <script type="text/javascript" src="../source/ui.accordion.js"></script> - <script type="text/javascript" src="../source/ui.slider.js"></script> + <link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen"> + + <script type="text/javascript" src="../jquery-1.2.6.js"></script> + <script type="text/javascript" src="../ui/ui.core.js"></script> + <script type="text/javascript" src="../ui/ui.accordion.js"></script> + <script type="text/javascript" src="../ui/ui.datepicker.js"></script> + <script type="text/javascript" src="../ui/ui.dialog.js"></script> + <script type="text/javascript" src="../ui/ui.draggable.js"></script> + <script type="text/javascript" src="../ui/ui.droppable.js"></script> + <script type="text/javascript" src="../ui/ui.resizable.js"></script> + <script type="text/javascript" src="../ui/ui.selectable.js"></script> + <script type="text/javascript" src="../ui/ui.slider.js"></script> + <script type="text/javascript" src="../ui/ui.sortable.js"></script> + <script type="text/javascript" src="../ui/ui.tabs.js"></script> - <script type="text/javascript" src="../../qunit/testrunner.js"></script> + <script type="text/javascript" src="qunit/testrunner.js"></script> + <script type="text/javascript" src="simulate/jquery.simulate.js"></script> <script type="text/javascript" src="accordion.js"></script> + <script type="text/javascript" src="datepicker.js"></script> + <script type="text/javascript" src="dialog.js"></script> + <script type="text/javascript" src="draggable.js"></script> + <script type="text/javascript" src="droppable.js"></script> + <script type="text/javascript" src="resizable.js"></script> + <script type="text/javascript" src="selectable.js"></script> <script type="text/javascript" src="slider.js"></script> + <script type="text/javascript" src="sortable.js"></script> + <script type="text/javascript" src="tabs.js"></script> + <style type="text/css"> .xerror, .error { display: none } </style> @@ -31,7 +49,10 @@ <ol id="tests"></ol> -<div id="main" style="position:absolute;top:-2000000px;"> + <div id="main" style="position:absolute;top:-2000000px;"> + + <div id='draggable1' style="background: green; width: 200px; height: 100px;">Relative</div> + <div id='draggable2' style="background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;"><span>Absolute</span></div> <div id='slider1'></div> <div id='slider3' style="position: relative; margin: 40px; width: 217px; height: 28px; background: url(http://developer.yahoo.com/yui/examples/slider/assets/bg-fader.gif) no-repeat scroll 5px 0px;"> diff --git a/tests/autodrag.html b/tests/autodrag.html index acc17fb4c..841bb026e 100644 --- a/tests/autodrag.html +++ b/tests/autodrag.html @@ -2,12 +2,13 @@ <html lang="en"> <head> <title>jQuery UI - Automated Tests</title> - <script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script> - <script type="text/javascript" src="../../ui/source/ui.core.js"></script> - <script type="text/javascript" src="../../ui/source/ui.draggable.js"></script> - <script type="text/javascript" src="../../ui/source/ui.selectable.js"></script> - <script type="text/javascript" src="jquery.simulate.js"></script> + <script type="text/javascript" src="../jquery-1.2.6.js"></script> + <script type="text/javascript" src="../ui/ui.core.js"></script> + <script type="text/javascript" src="../ui/ui.draggable.js"></script> + <script type="text/javascript" src="../ui/ui.selectable.js"></script> + + <script type="text/javascript" src="simulate/jquery.simulate.js"></script> <script type="text/javascript" src="ui.testmouse.js"></script> <style type="text/css"> diff --git a/tests/draggable.html b/tests/draggable.html index a70fb0df7..4cef7a1c4 100644 --- a/tests/draggable.html +++ b/tests/draggable.html @@ -1,28 +1,29 @@ <!DOCTYPE html> <html lang="en"> <head> -<meta http-equiv="Content-Language" content="en" /> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>Draggable Test Page</title> -<link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen"> - -<script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script> -<script type="text/javascript" src="../source/ui.core.js"></script> -<script type="text/javascript" src="../source/ui.draggable.js"></script> - -<script type="text/javascript" src="../../qunit/testrunner.js"></script> -<script type="text/javascript" src="draggable.js"></script> -<script type="text/javascript" src="jquery.simulate.js"></script> - -<style> - html { border: 0; } - #main { - position:absolute !important; - top: -1000px !important; - left: -1000px !important; - } -</style> + <meta http-equiv="Content-Language" content="en" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Draggable Test Page</title> + <link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen"> + + <script type="text/javascript" src="../jquery-1.2.6.js"></script> + <script type="text/javascript" src="../ui/ui.core.js"></script> + <script type="text/javascript" src="../ui/ui.draggable.js"></script> + + <script type="text/javascript" src="qunit/testrunner.js"></script> + <script type="text/javascript" src="simulate/jquery.simulate.js"></script> + + <script type="text/javascript" src="draggable.js"></script> + + <style> + html { border: 0; } + #main { + position:absolute !important; + top: -1000px !important; + left: -1000px !important; + } + </style> </head> <body> @@ -31,7 +32,7 @@ <h2 id="userAgent"></h2> <div id="main" style="border: 1px solid black; padding: 10px; margin: 10px;"> - <div id='draggable1' style="background: green; width: 200px; height: 100px;">Static</div> + <div id='draggable1' style="background: green; width: 200px; height: 100px;">Relative</div> <div id='draggable2' style="background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;"><span>Absolute</span></div> </div> diff --git a/tests/draggable.js b/tests/draggable.js index 299017b90..45b907d78 100644 --- a/tests/draggable.js +++ b/tests/draggable.js @@ -40,7 +40,7 @@ var border = function(el, side) { return parseInt(el.css('border-' + side + '-wi var margin = function(el, side) { return parseInt(el.css('margin-' + side)); } // Draggable Tests -module("Draggable"); +module("draggable"); test("init", function() { expect(6); @@ -160,7 +160,7 @@ test("No options, absolute", function() { moved(50, 50); }); -module("Draggable Options"); +module("draggable: Options"); test("{ axis: false }, default", function() { el = $("#draggable2").draggable({ axis: false }); @@ -429,7 +429,7 @@ test("{ zIndex: 10 }", function() { }); -module("Draggable Callbacks"); +module("draggable: Callbacks"); test("callbacks occurance count", function() { @@ -450,7 +450,7 @@ test("callbacks occurance count", function() { }); -module("Tickets"); +module("draggable: Tickets"); test("#2965 cursorAt with margin", function() { diff --git a/tests/resizable.html b/tests/resizable.html index 685ec88c9..69aa594d7 100644 --- a/tests/resizable.html +++ b/tests/resizable.html @@ -1,19 +1,20 @@ <!DOCTYPE html> <html lang="en"> <head> -<meta http-equiv="Content-Language" content="en" /> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>Resizable Test Page</title> -<link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen"> + <meta http-equiv="Content-Language" content="en" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Resizable Test Page</title> -<script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script> -<script type="text/javascript" src="../source/ui.core.js"></script> -<script type="text/javascript" src="../source/ui.resizable.js"></script> - -<script type="text/javascript" src="../../qunit/testrunner.js"></script> -<script type="text/javascript" src="resizable.js"></script> -<script type="text/javascript" src="jquery.simulate.js"></script> + <link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen"> + + <script type="text/javascript" src="../jquery-1.2.6.js"></script> + <script type="text/javascript" src="../ui/ui.core.js"></script> + <script type="text/javascript" src="../ui/ui.resizable.js"></script> + <script type="text/javascript" src="qunit/testrunner.js"></script> + <script type="text/javascript" src="simulate/jquery.simulate.js"></script> + + <script type="text/javascript" src="resizable.js"></script> </head> <style> diff --git a/tests/resizable.js b/tests/resizable.js index 48582e016..152691223 100644 --- a/tests/resizable.js +++ b/tests/resizable.js @@ -12,7 +12,7 @@ var drag = function(el, dx, dy, complete) { }); }; -module("Simple Resize"); +module("resizable"); test("ui-resizable-e resize x", function() { @@ -155,7 +155,7 @@ test("ui-resizable-nw resize xy", function() { * min/max Height/Width */ -module("Dimensions limit"); +module("resizable: Dimensions limit"); test("ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }", function() { @@ -233,7 +233,7 @@ test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 * Respecting ratio resize with dimensions limit */ -module("Respecting ratio resize with dimensions limits"); +module("resizable: Respecting ratio resize with dimensions limits"); test("ui-resizable-e { aspectRatio: 'preserve', handles: 'all', minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }", function() { @@ -361,7 +361,7 @@ test("ui-resizable-ne { aspectRatio: 'preserve', handles: 'all', minWidth: 70, m }); -module("Options"); +module("resizable: Options"); test("ui-resizable-se { handles: 'all', grid: [0, 20] }", function() { diff --git a/tests/slider.html b/tests/slider.html index 090cfd2bf..4be767a65 100644 --- a/tests/slider.html +++ b/tests/slider.html @@ -1,18 +1,20 @@ <!DOCTYPE html> <html lang="en"> <head> -<meta http-equiv="Content-Language" content="en" /> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<title>Slider Test Page</title> -<link rel="stylesheet" href="../../qunit/testsuite.css" type="text/css" media="screen"> + <meta http-equiv="Content-Language" content="en" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title>Slider Test Page</title> -<script type="text/javascript" src="../../jquery/jquery-1.2.6.js"></script> -<script type="text/javascript" src="../source/ui.core.js"></script> -<script type="text/javascript" src="../source/ui.slider.js"></script> - -<script type="text/javascript" src="../../qunit/testrunner.js"></script> -<script type="text/javascript" src="slider.js"></script> -<script type="text/javascript" src="jquery.simulate.js"></script> + <link rel="stylesheet" href="qunit/testsuite.css" type="text/css" media="screen"> + + <script type="text/javascript" src="../jquery-1.2.6.js"></script> + <script type="text/javascript" src="../ui/ui.core.js"></script> + <script type="text/javascript" src="../ui/ui.slider.js"></script> + + <script type="text/javascript" src="qunit/testrunner.js"></script> + <script type="text/javascript" src="simulate/jquery.simulate.js"></script> + + <script type="text/javascript" src="slider.js"></script> </head> <body> |