diff options
author | Dan Wellman <danwellman@hotmail.com> | 2011-12-12 23:50:15 +0000 |
---|---|---|
committer | Dan Wellman <danwellman@hotmail.com> | 2011-12-12 23:50:15 +0000 |
commit | a6fbbc573941679f1217a72b9ab5089f2ebfae69 (patch) | |
tree | eb00ed2387160e528b4ab04b0f88b6277a30d919 /tests | |
parent | c1c0827c67de6d52936d7b1906051ab7be95827b (diff) | |
parent | c00b685cb824fe940226be041067b0b9c44ba983 (diff) | |
download | jquery-ui-a6fbbc573941679f1217a72b9ab5089f2ebfae69.tar.gz jquery-ui-a6fbbc573941679f1217a72b9ab5089f2ebfae69.zip |
Merge branch 'selectmenu' of git://github.com/jquery/jquery-ui into selectmenu
Diffstat (limited to 'tests')
-rw-r--r-- | tests/visual/selectmenu/autocomplete.html | 94 | ||||
-rw-r--r-- | tests/visual/selectmenu/compatibility .html (renamed from tests/visual/selectmenu/tabs.html) | 59 | ||||
-rw-r--r-- | tests/visual/selectmenu/dialog.html | 72 | ||||
-rw-r--r-- | tests/visual/selectmenu/events.html | 2 | ||||
-rw-r--r-- | tests/visual/selectmenu/methods.html | 2 | ||||
-rw-r--r-- | tests/visual/selectmenu/option.html | 2 | ||||
-rw-r--r-- | tests/visual/selectmenu/themeswitcher.html | 104 |
7 files changed, 163 insertions, 172 deletions
diff --git a/tests/visual/selectmenu/autocomplete.html b/tests/visual/selectmenu/autocomplete.html deleted file mode 100644 index b9c161699..000000000 --- a/tests/visual/selectmenu/autocomplete.html +++ /dev/null @@ -1,94 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title>jQuery UI Selectmenu - Event functionality</title> - <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> - <script src="../../../jquery-1.7.1.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.autocomplete.js"></script> - <script src="../../../ui/jquery.ui.button.js"></script> - <script src="../../../ui/jquery.ui.menu.js"></script> - <script src="../../../ui/jquery.ui.selectmenu.js"></script> - <link rel="stylesheet" href="../../../demos/demos.css"> - <script> - $(function() { - $('select#speed').selectmenu(); - - var availableTags = [ - "ActionScript", - "AppleScript", - "Asp", - "BASIC", - "C", - "C++", - "Clojure", - "COBOL", - "ColdFusion", - "Erlang", - "Fortran", - "Groovy", - "Haskell", - "Java", - "JavaScript", - "Lisp", - "Perl", - "PHP", - "Python", - "Ruby", - "Scala", - "Scheme" - ]; - $( "#tags" ).autocomplete({ - source: availableTags - }); - }); - </script> - <style> - form { margin: 20px 0 0 0 } - fieldset { border: 0; } - label { display: block; } - select { width: 200px; } - </style> -</head> -<body> - -<div class="demo"> - - -<form action="#"> - <fieldset> - <label for="speed">Select a speed:</label> - <select name="speed" id="speed"> - <option value="Slower">Slower</option> - <option value="Slow">Slow</option> - <option value="Medium" selected="selected">Medium</option> - <option value="Fast">Fast</option> - <option value="Faster">Faster</option> - </select> - </fieldset> -</form> - -<br /> -<br /> -<br /> -<br /> -<br /> -<br /> -<br /> -<br /> -<br /> - -<div class="ui-widget"> - <label for="tags">Tags: </label> - <input id="tags"> -</div> - -</div><!-- End demo --> - - - -</body> -</html> diff --git a/tests/visual/selectmenu/tabs.html b/tests/visual/selectmenu/compatibility .html index 658da8a20..a99a629df 100644 --- a/tests/visual/selectmenu/tabs.html +++ b/tests/visual/selectmenu/compatibility .html @@ -2,21 +2,52 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>jQuery UI Selectmenu - Event functionality</title> + <title>jQuery UI Selectmenu - Compatibility with other widgets</title> <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> <script src="../../../jquery-1.7.1.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.tabs.js"></script> + <script src="../../../ui/jquery.ui.dialog.js"></script> + <script src="../../../ui/jquery.ui.autocomplete.js"></script> <script src="../../../ui/jquery.ui.button.js"></script> <script src="../../../ui/jquery.ui.menu.js"></script> <script src="../../../ui/jquery.ui.selectmenu.js"></script> <link rel="stylesheet" href="../../../demos/demos.css"> <script> $(function() { - $( "#tabs" ).tabs(); $('select').selectmenu(); + + var availableTags = [ + "ActionScript", + "AppleScript", + "Asp", + "BASIC", + "C", + "C++", + "Clojure", + "COBOL", + "ColdFusion", + "Erlang", + "Fortran", + "Groovy", + "Haskell", + "Java", + "JavaScript", + "Lisp", + "Perl", + "PHP", + "Python", + "Ruby", + "Scala", + "Scheme" + ]; + $( "#tags" ).autocomplete({ + source: availableTags + }); + $( "#tabs" ).tabs(); + $( "#dialog" ).dialog(); }); </script> <style> @@ -24,17 +55,22 @@ fieldset { border: 0; } label { display: block; } select { width: 200px; } + #tabs { margin: 50px 0 0 0 } </style> </head> <body> <div class="demo"> +<div class="ui-widget"> + <label for="tags">Tags: </label> + <input id="tags"> +</div> <div id="tabs"> <ul> <li><a href="#tabs-1">Nunc tincidunt</a></li> - <li><a href="#tabs-2">Proin dolor</a></li> + <li><a href="#tabs-2">Selectmenu</a></li> <li><a href="#tabs-3">Aenean lacinia</a></li> </ul> <div id="tabs-1"> @@ -60,6 +96,23 @@ </div> </div> +<div id="dialog" title="Basic dialog"> + <p>Some example content</p> + <p><a href="#nogo">Test Link</a></p> + <form action="#"> + <fieldset> + <label for="speed">Select a speed:</label> + <select name="speed" id="speed"> + <option value="Slower">Slower</option> + <option value="Slow">Slow</option> + <option value="Medium" selected="selected">Medium</option> + <option value="Fast">Fast</option> + <option value="Faster">Faster</option> + </select> + </fieldset> + </form> +</div> + </div><!-- End demo --> diff --git a/tests/visual/selectmenu/dialog.html b/tests/visual/selectmenu/dialog.html deleted file mode 100644 index f80083933..000000000 --- a/tests/visual/selectmenu/dialog.html +++ /dev/null @@ -1,72 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> - <title>jQuery UI Selectmenu - Event functionality</title> - <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> - <script src="../../../jquery-1.7.1.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.dialog.js"></script> - <script src="../../../ui/jquery.ui.button.js"></script> - <script src="../../../ui/jquery.ui.menu.js"></script> - <script src="../../../ui/jquery.ui.selectmenu.js"></script> - <link rel="stylesheet" href="../../../demos/demos.css"> - <script> - $(function() { - $('select#speed').selectmenu(); - - $( "#dialog" ).dialog(); - }); - </script> - <style> - form { margin: 20px 0 0 0 } - fieldset { border: 0; } - label { display: block; } - select { width: 200px; } - </style> -</head> -<body> - -<div class="demo"> - - -<div id="dialog" title="Basic dialog"> - <p>Some example content</p> - <p><a href="#nogo">Test Link</a></p> - <form action="#"> - <fieldset> - <label for="speed">Select a speed:</label> - <select name="speed" id="speed"> - <option value="Slower">Slower</option> - <option value="Slow">Slow</option> - <option value="Medium" selected="selected">Medium</option> - <option value="Fast">Fast</option> - <option value="Faster">Faster</option> - </select> - </fieldset> - </form> -</div> - -<!-- Sample page content to illustrate the layering of the dialog --> -<div class="hiddenInViewSource" style="padding:20px;"> -<p>Sed vel diam id libero <a href="http://example.com">rutrum convallis</a>. Donec aliquet leo vel magna. Phasellus rhoncus faucibus ante. Etiam bibendum, enim faucibus aliquet rhoncus, arcu felis ultricies neque, sit amet auctor elit eros a lectus.</p> -<form> - <input value="text input" /><br /> - <input type="checkbox" />checkbox<br /> - <input type="radio" />radio<br /> - <select> - <option>select</option> - </select><br /><br /> - <textarea>textarea</textarea><br /> -</form> -</div><!-- End sample page content --> - - -</div><!-- End demo --> - - - -</body> -</html> diff --git a/tests/visual/selectmenu/events.html b/tests/visual/selectmenu/events.html index e17434add..7371e1373 100644 --- a/tests/visual/selectmenu/events.html +++ b/tests/visual/selectmenu/events.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>jQuery UI Selectmenu - Event functionality</title> + <title>jQuery UI Selectmenu - Events functionality</title> <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> <script src="../../../jquery-1.7.1.js"></script> <script src="../../../ui/jquery.ui.core.js"></script> diff --git a/tests/visual/selectmenu/methods.html b/tests/visual/selectmenu/methods.html index 5476dfff8..b3e5a42e5 100644 --- a/tests/visual/selectmenu/methods.html +++ b/tests/visual/selectmenu/methods.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>jQuery UI Selectmenu - Event functionality</title> + <title>jQuery UI Selectmenu - Methids functionality</title> <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> <script src="../../../jquery-1.7.1.js"></script> <script src="../../../ui/jquery.ui.core.js"></script> diff --git a/tests/visual/selectmenu/option.html b/tests/visual/selectmenu/option.html index fef35ab9f..308a9ebc2 100644 --- a/tests/visual/selectmenu/option.html +++ b/tests/visual/selectmenu/option.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>jQuery UI Selectmenu - Event functionality</title> + <title>jQuery UI Selectmenu - Option functionality</title> <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> <script src="../../../jquery-1.7.1.js"></script> <script src="../../../ui/jquery.ui.core.js"></script> diff --git a/tests/visual/selectmenu/themeswitcher.html b/tests/visual/selectmenu/themeswitcher.html new file mode 100644 index 000000000..c533fc4ae --- /dev/null +++ b/tests/visual/selectmenu/themeswitcher.html @@ -0,0 +1,104 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title>jQuery UI Selectmenu - Themeswitcher functionality</title> + <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> + <script src="../../../jquery-1.7.1.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.button.js"></script> + <script src="../../../ui/jquery.ui.menu.js"></script> + <script src="../../../ui/jquery.ui.selectmenu.js"></script> + <link rel="stylesheet" href="../../../demos/demos.css"> + <script> + $(function() { + $('select#speed').selectmenu(); + + var withOverflow = $('select#number').selectmenu({ + dropdown: false + }); + withOverflow.selectmenu("widget").addClass("overflow"); + + $('select#files').selectmenu(); + }); + </script> + <style> + form { margin: 100px 0 0 0 } + fieldset { border: 0; } + label { display: block; } + select { width: 200px; } + .overflow ul { height: 200px; overflow: auto; overflow-y: auto; overflow-x: hidden;} + </style> +</head> +<body> + +<div class="demo"> + +<form action="#"> + <fieldset> + <label for="speed">Select a speed:</label> + <select name="speed" id="speed"> + <option value="Slower">Slower</option> + <option value="Slow">Slow</option> + <option value="Medium" selected="selected">Medium</option> + <option value="Fast">Fast</option> + <option value="Faster">Faster</option> + </select> + <br /> + <br /> + <br /> + <label for="number">Select a number:</label> + <select name="number" id="number"> + <option value="1">1</option> + <option value="2" selected="selected">2</option> + <option value="3">3</option> + <option value="4">4</option> + <option value="5">5</option> + <option value="6">6</option> + <option value="7">7</option> + <option value="8">8</option> + <option value="9">9</option> + <option value="10">10</option> + <option value="11">11</option> + <option value="12">12</option> + <option value="13">13</option> + <option value="14">14</option> + <option value="15">15</option> + <option value="16">16</option> + <option value="17">17</option> + <option value="18">18</option> + <option value="19">19</option> + </select> + <br /> + <br /> + <br /> + <label for="files">Select a file:</label> + <select name="files" id="files"> + <optgroup label="Scripts"> + <option value="jquery">jQuery.js</option> + <option value="jqueryui">ui.jQuery.js</option> + </optgroup> + <optgroup label="Other files"> + <option value="somefile">Some unknown file</option> + <option value="someotherfile">Some other file</option> + </optgroup> + </select> + </fieldset> +</form> + +</div><!-- End demo --> + + +<script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script> +<script> + $('<div/>').css({ + position: "absolute", + right: 10, + top: 10 + }).appendTo(document.body).themeswitcher(); +</script> + +</body> +</html> |