aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-02-22 00:22:08 +0100
committerFelix Nagel <info@felixnagel.com>2012-02-22 00:22:08 +0100
commitaf0d520704b11977f10c0b40043298330497845a (patch)
tree75a160dcb88b27f1faf0a44bc68d19d3fff86377
parentafcdd6a75cb4c8e1e74b84ccfbdb543b35342337 (diff)
downloadjquery-ui-af0d520704b11977f10c0b40043298330497845a.tar.gz
jquery-ui-af0d520704b11977f10c0b40043298330497845a.zip
Selectmenu: merge themeswitcher with compatibility visual test
-rw-r--r--tests/visual/selectmenu/compatibility.html9
-rw-r--r--tests/visual/selectmenu/themeswitcher.html104
2 files changed, 8 insertions, 105 deletions
diff --git a/tests/visual/selectmenu/compatibility.html b/tests/visual/selectmenu/compatibility.html
index a99a629df..3629243a3 100644
--- a/tests/visual/selectmenu/compatibility.html
+++ b/tests/visual/selectmenu/compatibility.html
@@ -115,7 +115,14 @@
</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>
diff --git a/tests/visual/selectmenu/themeswitcher.html b/tests/visual/selectmenu/themeswitcher.html
deleted file mode 100644
index c533fc4ae..000000000
--- a/tests/visual/selectmenu/themeswitcher.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!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>