diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:58:57 +0100 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:58:57 +0100 |
| commit | 0479ab6af6414c7a8e779c3cab3e7e8406f9eb62 (patch) | |
| tree | cab8e0ea33ef3db131877d307a2b7c7099b7709e /tests/visual/compound | |
| parent | 3552947c19b8ea1b779dc9809783c6ac6a218d68 (diff) | |
| parent | 1fd34199efa9ddc35276b415cad8e7e37a6cc856 (diff) | |
| download | jquery-ui-0479ab6af6414c7a8e779c3cab3e7e8406f9eb62.tar.gz jquery-ui-0479ab6af6414c7a8e779c3cab3e7e8406f9eb62.zip | |
Merge remote branch 'origin/tooltip'
Conflicts:
demos/autocomplete/combobox.html
demos/index.html
tests/unit/index.html
Diffstat (limited to 'tests/visual/compound')
| -rw-r--r-- | tests/visual/compound/tabs_tooltips.html | 37 | ||||
| -rw-r--r-- | tests/visual/compound/widgets_in_dialog.html | 9 |
2 files changed, 43 insertions, 3 deletions
diff --git a/tests/visual/compound/tabs_tooltips.html b/tests/visual/compound/tabs_tooltips.html new file mode 100644 index 000000000..00046fe0d --- /dev/null +++ b/tests/visual/compound/tabs_tooltips.html @@ -0,0 +1,37 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8" /> + <title>Compound Visual Test : Tabs in Tabs</title> + <link rel="stylesheet" href="../visual.css" type="text/css" /> + <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css" type="text/css"> + <script type="text/javascript" src="../../../jquery-1.4.2.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.tooltip.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script> + <script type="text/javascript"> + $(function() { + $("#tabs").tabs(); + $("a").tooltip(); + }); + </script> +</head> +<body> + +<div id="tabs"> + <ul> + <li><a href="#tabs-1" title="first tab tooltip">First</a></li> + <li><a href="#tabs-2" title="second tab tooltip">Second</a></li> + </ul> + <div id="tabs-1"> + <a href="#" title="title content">label</a> + </div> + <div id="tabs-2"> + <a href="#" title="other title content">other label</a> + </div> +</div> + +</body> +</html> diff --git a/tests/visual/compound/widgets_in_dialog.html b/tests/visual/compound/widgets_in_dialog.html index dc1b551cf..809ee5656 100644 --- a/tests/visual/compound/widgets_in_dialog.html +++ b/tests/visual/compound/widgets_in_dialog.html @@ -20,8 +20,11 @@ <script type="text/javascript" src="../../../ui/jquery.ui.progressbar.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.slider.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.tooltip.js"></script> <script type="text/javascript"> $(function() { + $("[title]").tooltip(); + $("#accordion").accordion(); $("#autocomplete").autocomplete({ source: ["c++", "java", "php", "coldfusion", "javascript", "asp", "ruby", "python", "c", "scala", "groovy", "haskell", "perl"] @@ -50,7 +53,7 @@ width: 100, height: 75, modal: true - }) + }); }); </script> </head> @@ -76,11 +79,11 @@ <input id="datepicker"> <button>Another button</button> <div> - <label for="progress">Progress: <input id="progress" /></label> + <label for="progress">Progress: <input title="The progress we made so far" id="progress" /></label> </div> <div id="progressbar"> </div> - <div id="slider"></div> + <div id="slider" title="Sliding progress..."></div> <div id="tabs"> <ul> <li><a href="#tabs-1">First</a></li> |