Merge branch 'master' into selectmenu

Author: fnagel

.travis.yml

@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - "0.8"
+before_script:
+  - npm install -g grunt-cli

AUTHORS.txt

@@ -243,3 +243,8 @@ Zaven Muradyan <megalivoithos@gmail.com>
 Woody Gilk <shadowhand@deviantart.com>
 Zbigniew Motyka <zbigniew.motyka@gmail.com>
 Suhail Alkowaileet <xsoh.k7@gmail.com>
+Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
+David Hansen <hansede@gmail.com>
+Brian Grinstead <briangrinstead@gmail.com>
+Christian Klammer <christian314159@gmail.com>
+Steven Luscher <jquerycla@steveluscher.com>

build/effect.json

@@ -23,15 +23,23 @@
 	"highlight": {
 		"description": "Highlights the background of an element in a defined color for a custom duration."
 	},
+	"puff": {
+		"dependencies": [ "effect-scale" ],
+		"description": "Creates a puff effect by scaling the element up and hiding it at the same time."
+	},
 	"pulsate": {
 		"description": "Pulsates an element n times by changing the opacity to zero and back."
 	},
 	"scale": {
+		"dependencies": [ "effect-size" ],
 		"description": "Grows or shrinks an element and its content. Restores an elemnt to its original size."
 	},
 	"shake": {
 		"description": "Shakes an element horizontally or vertically n times."
 	},
+	"size": {
+		"description": "Resize an element to a specified width and height."
+	},
 	"slide": {
 		"description": "Slides an element in and out of the viewport."
 	}

demos/addClass/index.html

@@ -14,9 +14,11 @@
 	<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-puff.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-size.js"></script>
 	<script src="../../ui/jquery.ui.effect-slide.js"></script>
 	<script src="../../ui/jquery.ui.effect-transfer.js"></script>
 	<link rel="stylesheet" href="../demos.css">

demos/animate/index.html

@@ -9,6 +9,14 @@
 <ul>
 	<li><a href="default.html">Effect showcase</a></li>
 	<li><a href="easing.html">Easing showcase</a></li>
+	<li><a href="addClass.html">.addClass()</a></li>
+	<li><a href="animate.html">.animate()</a></li>
+	<li><a href="hide.html">.hide()</a></li>
+	<li><a href="removeClass.html">.removeClass()</a></li>
+	<li><a href="show.html">.show()</a></li>
+	<li><a href="switchClass.html">.switchClass()</a></li>
+	<li><a href="toggle.html">.toggle()</a></li>
+	<li><a href="toggleClass.html">.toggleClass()</a></li>
 </ul>
 
 </body>