diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-07-12 23:57:55 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-07-12 23:57:55 +0200 |
| commit | 5092d0296a010280ee9d004f2fe06afbf1c45db5 (patch) | |
| tree | ac6b97b4551b4aebf8d90cc35add82fc7088e0a3 /tests/visual | |
| parent | 39532f0a8e70e21e33aab03f08136f662d03a4a1 (diff) | |
| parent | e054e28836e616ed03561d5a8195bbea525866d1 (diff) | |
| download | jquery-ui-5092d0296a010280ee9d004f2fe06afbf1c45db5.tar.gz jquery-ui-5092d0296a010280ee9d004f2fe06afbf1c45db5.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'tests/visual')
| -rw-r--r-- | tests/visual/addClass/queue.html | 2 | ||||
| -rw-r--r-- | tests/visual/effects/all.html | 28 | ||||
| -rw-r--r-- | tests/visual/effects/scale.html | 4 | ||||
| -rw-r--r-- | tests/visual/menu/menu.html | 5 | ||||
| -rw-r--r-- | tests/visual/tooltip/animations.html | 10 |
5 files changed, 25 insertions, 24 deletions
diff --git a/tests/visual/addClass/queue.html b/tests/visual/addClass/queue.html index 21f4cc1cb..0b7a43656 100644 --- a/tests/visual/addClass/queue.html +++ b/tests/visual/addClass/queue.html @@ -5,7 +5,7 @@ <title>addClass Visual Test : Queue</title> <link rel="stylesheet" href="../../../themes/base/jquery.ui.all.css"> <script src="../../../jquery-1.7.2.js"></script> - <script src="../../../ui/jquery.effects.core.js"></script> + <script src="../../../ui/jquery.ui.effect.js"></script> <style> .box { width: 100px; diff --git a/tests/visual/effects/all.html b/tests/visual/effects/all.html index 15bfcd254..1797c5715 100644 --- a/tests/visual/effects/all.html +++ b/tests/visual/effects/all.html @@ -5,20 +5,20 @@ <title>jQuery UI Effects Test Suite</title> <link rel="stylesheet" href="effects.css"> <script src="../../../jquery-1.7.2.js"></script> - <script src="../../../ui/jquery.effects.core.js"></script> - <script src="../../../ui/jquery.effects.blind.js"></script> - <script src="../../../ui/jquery.effects.bounce.js"></script> - <script src="../../../ui/jquery.effects.clip.js"></script> - <script src="../../../ui/jquery.effects.drop.js"></script> - <script src="../../../ui/jquery.effects.explode.js"></script> - <script src="../../../ui/jquery.effects.fade.js"></script> - <script src="../../../ui/jquery.effects.fold.js"></script> - <script src="../../../ui/jquery.effects.highlight.js"></script> - <script src="../../../ui/jquery.effects.pulsate.js"></script> - <script src="../../../ui/jquery.effects.scale.js"></script> - <script src="../../../ui/jquery.effects.shake.js"></script> - <script src="../../../ui/jquery.effects.slide.js"></script> - <script src="../../../ui/jquery.effects.transfer.js"></script> + <script src="../../../ui/jquery.ui.effect.js"></script> + <script src="../../../ui/jquery.ui.effect-blind.js"></script> + <script src="../../../ui/jquery.ui.effect-bounce.js"></script> + <script src="../../../ui/jquery.ui.effect-clip.js"></script> + <script src="../../../ui/jquery.ui.effect-drop.js"></script> + <script src="../../../ui/jquery.ui.effect-explode.js"></script> + <script src="../../../ui/jquery.ui.effect-fade.js"></script> + <script src="../../../ui/jquery.ui.effect-fold.js"></script> + <script src="../../../ui/jquery.ui.effect-highlight.js"></script> + <script src="../../../ui/jquery.ui.effect-pulsate.js"></script> + <script src="../../../ui/jquery.ui.effect-scale.js"></script> + <script src="../../../ui/jquery.ui.effect-shake.js"></script> + <script src="../../../ui/jquery.ui.effect-slide.js"></script> + <script src="../../../ui/jquery.ui.effect-transfer.js"></script> <script src="effects.js"></script> </head> <body> diff --git a/tests/visual/effects/scale.html b/tests/visual/effects/scale.html index add2ba01c..bca21a45f 100644 --- a/tests/visual/effects/scale.html +++ b/tests/visual/effects/scale.html @@ -5,8 +5,8 @@ <title>jQuery UI Effects Test Suite</title> <link rel="stylesheet" href="effects.css"> <script src="../../../jquery-1.7.2.js"></script> - <script src="../../../ui/jquery.effects.core.js"></script> - <script src="../../../ui/jquery.effects.scale.js"></script> + <script src="../../../ui/jquery.ui.effect.js"></script> + <script src="../../../ui/jquery.ui.effect-scale.js"></script> <script> $(function() { var test = $( "#testBox" ), diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html index 5bda32eae..205cb10c9 100644 --- a/tests/visual/menu/menu.html +++ b/tests/visual/menu/menu.html @@ -26,7 +26,8 @@ $( "#menu6" ).menu({ menus: ".menuElement", - select: logger + select: logger, + icon: "ui-icon-carat-1-s" }); }); </script> @@ -212,7 +213,7 @@ </blockquote> </div> -<h2>Menu with custom markup, multi-line items</h2> +<h2>Menu with custom markup, multi-line items and a custom submenu icon</h2> <div class="menuElement" id="menu6"> <div class="address-item"> <a href="#"> diff --git a/tests/visual/tooltip/animations.html b/tests/visual/tooltip/animations.html index 24fe02905..15badb618 100644 --- a/tests/visual/tooltip/animations.html +++ b/tests/visual/tooltip/animations.html @@ -9,11 +9,11 @@ <script src="../../../ui/jquery.ui.widget.js"></script> <script src="../../../ui/jquery.ui.position.js"></script> <script src="../../../ui/jquery.ui.tooltip.js"></script> - <script src="../../../ui/jquery.effects.core.js"></script> - <script src="../../../ui/jquery.effects.blind.js"></script> - <script src="../../../ui/jquery.effects.bounce.js"></script> - <script src="../../../ui/jquery.effects.drop.js"></script> - <script src="../../../ui/jquery.effects.explode.js"></script> + <script src="../../../ui/jquery.ui.effect.js"></script> + <script src="../../../ui/jquery.ui.effect-blind.js"></script> + <script src="../../../ui/jquery.ui.effect-bounce.js"></script> + <script src="../../../ui/jquery.ui.effect-drop.js"></script> + <script src="../../../ui/jquery.ui.effect-explode.js"></script> <style> pre { width: 250px; |