aboutsummaryrefslogtreecommitdiffstats
path: root/tests/visual
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-02-29 22:09:26 -0500
committerScott González <scott.gonzalez@gmail.com>2012-02-29 22:09:26 -0500
commitb4d9eee966f1dec06f0772e38bba9e5c864374f9 (patch)
tree6560f7f0b2cb9e688e46727f8ad27aac6eeccb79 /tests/visual
parent8c10c1e41b07ebadf8b3cf67fac88d27ee6c9fdb (diff)
parent63215a68757c4fa78079a48488d9a91f0ec8cf50 (diff)
downloadjquery-ui-b4d9eee966f1dec06f0772e38bba9e5c864374f9.tar.gz
jquery-ui-b4d9eee966f1dec06f0772e38bba9e5c864374f9.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'tests/visual')
-rw-r--r--tests/visual/accordion/accordion.html95
-rw-r--r--tests/visual/tooltip/tooltip.html37
2 files changed, 117 insertions, 15 deletions
diff --git a/tests/visual/accordion/accordion.html b/tests/visual/accordion/accordion.html
new file mode 100644
index 000000000..939930511
--- /dev/null
+++ b/tests/visual/accordion/accordion.html
@@ -0,0 +1,95 @@
+<!doctype html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title>Accordion Visual Test</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.accordion.js"></script>
+ <script>
+ $(function() {
+ $( "#accordion-ynynyn" ).accordion({ icons: null });
+ $( "#accordion-ynyny" ).accordion();
+ $( "#accordion-ynyn" ).accordion({ icons: null });
+ $( "#accordion-yny" ).accordion();
+ $( "#accordion-yn" ).accordion({ icons: null });
+ $( "#accordion-y" ).accordion();
+
+ $( "#accordion-nynyny" ).accordion();
+ $( "#accordion-nynyn" ).accordion({ icons: null });
+ $( "#accordion-nyny" ).accordion();
+ $( "#accordion-nyn" ).accordion({ icons: null });
+ $( "#accordion-ny" ).accordion();
+ $( "#accordion-n" ).accordion({ icons: null });
+ });
+ </script>
+</head>
+<body>
+
+<p>WHAT: The following set of nested accordions alternate between icons and no icons.</p>
+<p>EXPECTED: The padding on the headers should correctly account for the icon settings.</p>
+
+<div id="accordion-y">
+ <div>Icons</div>
+ <div>
+ <div id="accordion-yn">
+ <div>No Icons</div>
+ <div>
+ <div id="accordion-yny">
+ <div>Icons</div>
+ <div>
+ <div id="accordion-ynyn">
+ <div>No Icons</div>
+ <div>
+ <div id="accordion-ynyny">
+ <div>Icons</div>
+ <div>
+ <div id="accordion-ynynyn">
+ <div>No Icons</div>
+ <div></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<div id="accordion-n">
+ <div>No Icons</div>
+ <div>
+ <div id="accordion-ny">
+ <div>Icons</div>
+ <div>
+ <div id="accordion-nyn">
+ <div>No Icons</div>
+ <div>
+ <div id="accordion-nyny">
+ <div>Icons</div>
+ <div>
+ <div id="accordion-nynyn">
+ <div>No Icons</div>
+ <div>
+ <div id="accordion-nynyny">
+ <div>Icons</div>
+ <div></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+</body>
+</html>
diff --git a/tests/visual/tooltip/tooltip.html b/tests/visual/tooltip/tooltip.html
index b282a73b7..eb51d56c6 100644
--- a/tests/visual/tooltip/tooltip.html
+++ b/tests/visual/tooltip/tooltip.html
@@ -23,8 +23,8 @@
function enable() {
// default
- $("#context1, form, #childish").tooltip();
-
+ $("#context1, form, #childish, #nested-input").tooltip();
+
// custom class, replaces ui-widget-content
$("#context2").tooltip({
tooltipClass: "ui-widget-header"
@@ -32,7 +32,7 @@
$("#right1").tooltip({
tooltipClass: "ui-state-error"
});
-
+
// synchronous content
$("#footnotes").tooltip({
items: "[href^='#']",
@@ -65,7 +65,7 @@
return "Loading...";
}
});
-
+
// custom position
$("#right2").tooltip({
tooltipClass: "ui-state-highlight",
@@ -75,7 +75,7 @@
offset: "0 10"
}
});
-
+
$("#button1").button();
$("#button2").button({
icons: {
@@ -97,7 +97,7 @@
});
}
enable();
-
+
$("#disable").toggle(function() {
$(":ui-tooltip").tooltip("disable");
}, function() {
@@ -126,23 +126,23 @@
<div id="right1" style="position: absolute; right: 1em" title="right aligned element">
collision detection should kick in around here
</div>
-
+
<div id="footnotes" style="margin: 2em 0">
<a href="#footnote1">I'm a link to a footnote.</a>
<a href="#footnote2">I'm another link to a footnote.</a>
</div>
-
+
<div id="right2" style="position: absolute; right: 1em" title="right aligned element with custom position">
right aligned with custom position
</div>
-
+
<div id="ajax" style="width: 100px;" class="ui-widget-content" title="never be seen">
gets its content via ajax
</div>
<div id="ajax2" style="width: 100px;" class="ui-widget-content" title="never be seen">
gets its content via ajax, caches the response
</div>
-
+
<div id="context2" class="ui-widget ui-widget-content">
<span title="something" style="border:1px solid blue">span</span>
<div title="something else" style="border:1px solid red;">
@@ -150,11 +150,11 @@
<span title="something more" style="border:1px solid green;">nested span</span>
</div>
</div>
-
+
<div id="childish" class="ui-widget ui-widget-content" style="margin: 2em 0; border: 1px solid black;" title="element with child elements">
Text in <strong>bold</strong>.
</div>
-
+
<form style="margin: 2em 0;">
<div>
<label for="first">First Name:</label>
@@ -165,17 +165,24 @@
<input id="last" title="Your last name is optional" />
</div>
</form>
-
+
+ <div id="nested-input">
+ <label title="test"><input type="checkbox">This is a test</label>
+ <label title="test2"><input type="checkbox">This is a test</label>
+ <label><input type="checkbox" title="test3">This is a test</label>
+ <label><input type="checkbox" title="test4">This is a test</label>
+ </div>
+
<div id="buttons">
<button id="button1" title="Button Tooltip">Button Label</button>
<button id="button2" title="Icon Button">Button with Icon</button>
<button id="button3">Icon Only Button 1</button>
<button id="button4">Icon Only Button 2</button>
</div>
-
+
<div id="footnote1">This is <strong>the</strong> footnote, including other elements</div>
<div id="footnote2">This is <strong>the other</strong> footnote, including other elements</div>
-
+
<button id="disable">Toggle disabled</button>
<button id="toggle">Toggle widget</button>
</div>