Added tests for 193 and 170.

Removed unused line of code from fx.

diff --git a/build/test/index.html b/build/test/index.html
index 5666d6e09b7a463c3fe23457cdf9cd67691844a6..d79ba4e278768f91a7cb0de663cc440704705353 100644 (file)
--- a/build/test/index.html
+++ b/build/test/index.html
@@ -3,10 +3,10 @@
        <script type="text/javascript" src="../dist/jquery.js"></script>
        <script type="text/javascript" src="data/testrunner.js"></script>
        <script>
-       $(document).ready(function(){\r
+       $(document).ready(function(){
                runTest(function() {
-                       {TESTS}\r
-               });\r
+                       {TESTS}
+               });
        });
        </script>
        <style>.pass { color: green; } .fail { color: red; } #tests ol { display: none; }</style>
@@ -30,11 +30,11 @@
                        <p lang="en" id="en">This is a normal link: <a id="yahoo" href="http://www.yahoo.com/" class="blogTest">Yahoo</a></p>
                        <p id="sap">This link has <code><a href="#2" id="anchor2">class="blog"</a></code>: <a href="http://simon.incutio.com/" class="blog link" id="simon">Simon Willison's Weblog</a></p>
 
-               </div>\r
-               <p id="first">Try them out:</p>\r
+               </div>
+               <p id="first">Try them out:</p>
                <ul id="firstUL"></ul>
                <ol id="empty"></ol>
-               <form id="form" action="formaction">\r
+               <form id="form" action="formaction">
                        <input type="text" name="action" value="Test" id="text1"/>
                        <input type="text" name="text2" value="Test" id="text2" disabled="disabled"/>
                        <input type="radio" name="radio1" id="radio1"/>
@@ -44,33 +44,34 @@
                        <input type="checkbox" id="check2"/>
 
                        <input type="hidden" name="hidden" id="hidden1"/>
-                       <input type="text" style="display:none;" name="foo[bar]" id="hidden2"/>\r
-                       \r
-                       <input type="text" id="name" name="name" value="name" />\r
-                       \r
-                       <button id="button" name="button">Button</button>\r
-                       \r
-                       <textarea id="area1">foobar</textarea>\r
-                       \r
-                       <select name="select1" id="select1">\r
-                               <option id="option1a" value="">Nothing</option>\r
-                               <option id="option1b" value="1">1</option>\r
-                               <option id="option1c" value="2">2</option>\r
-                               <option id="option1d" value="3">3</option>\r
-                       </select>\r
-                       <select name="select2" id="select2">\r
-                               <option id="option2a" value="">Nothing</option>\r
-                               <option id="option2b" value="1">1</option>\r
-                               <option id="option2c" value="2">2</option>\r
-                               <option id="option2d" selected="selected" value="3">3</option>\r
-                       </select>\r
-                       <select name="select3" id="select3" multiple="multiple">\r
-                               <option id="option3a" value="">Nothing</option>\r
-                               <option id="option3b" selected="selected" value="1">1</option>\r
-                               <option id="option3c" selected="selected" value="2">2</option>\r
-                               <option id="option3d" value="3">3</option>\r
+                       <input type="text" style="display:none;" name="foo[bar]" id="hidden2"/>
+                       
+                       <input type="text" id="name" name="name" value="name" />
+                       
+                       <button id="button" name="button">Button</button>
+                       
+                       <textarea id="area1">foobar</textarea>
+                       
+                       <select name="select1" id="select1">
+                               <option id="option1a" value="">Nothing</option>
+                               <option id="option1b" value="1">1</option>
+                               <option id="option1c" value="2">2</option>
+                               <option id="option1d" value="3">3</option>
+                       </select>
+                       <select name="select2" id="select2">
+                               <option id="option2a" value="">Nothing</option>
+                               <option id="option2b" value="1">1</option>
+                               <option id="option2c" value="2">2</option>
+                               <option id="option2d" selected="selected" value="3">3</option>
+                       </select>
+                       <select name="select3" id="select3" multiple="multiple">
+                               <option id="option3a" value="">Nothing</option>
+                               <option id="option3b" selected="selected" value="1">1</option>
+                               <option id="option3c" selected="selected" value="2">2</option>
+                               <option id="option3d" value="3">3</option>
                        </select>
                </form>
+               <p id="floatTest">Float test.</div>
        </div>
        </dl>
        

diff --git a/src/fx/fx.js b/src/fx/fx.js
index 6bbc772e3bdd4d32fa653b34ba258e66a1b1d899..3fd4990208b17df7fed6a12732b8353453fd28d1 100644 (file)
--- a/src/fx/fx.js
+++ b/src/fx/fx.js
@@ -493,8 +493,6 @@ jQuery.extend({
                        // Remember where we started, so that we can go back to it later
                        z.el.orig[prop] = this.cur();
                        
-                       var start = z.el.orig[prop];
-                       
                        // Begin the animation
                        z.custom(0, z.el.orig[prop]);
 

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 2ddb919cc506a4ba2746da66d1cbf72e07b9543b..686c20d7bfd69d4b78886792a88aa2bd41ac4ea6 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -534,6 +534,14 @@ jQuery.fn = jQuery.prototype = {
         * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
         * $('#foo').css({display: 'block'});
         * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+        * $('#floatTest').css({styleFloat: 'right'});
+        * ok( $('#floatTest').css('styleFloat') == 'right', 'Modified CSS float using "styleFloat": Assert float is right');
+        * $('#floatTest').css({cssFloat: 'left'});
+        * ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left');
+        * $('#floatTest').css({'float': 'right'});
+        * ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right');
+        * $('#floatTest').css({'font-size': '30px'});
+        * ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px');
         * 
         * @name css
         * @type jQuery
@@ -555,6 +563,14 @@ jQuery.fn = jQuery.prototype = {
         * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
         * $('#foo').css('display', 'block');
         * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
+        * $('#floatTest').css('styleFloat', 'left');
+        * ok( $('#floatTest').css('styleFloat') == 'left', 'Modified CSS float using "styleFloat": Assert float is left');
+        * $('#floatTest').css('cssFloat', 'right');
+        * ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right');
+        * $('#floatTest').css('float', 'left');
+        * ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left');
+        * $('#floatTest').css('font-size', '20px');
+        * ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px');
         *
         * @name css
         * @type jQuery