From 6f7cd669597cbcf026886074fb31963fe767e2b3 Mon Sep 17 00:00:00 2001
From: Brandon Aaron <brandon.aaron@gmail.com>
Date: Tue, 17 Oct 2006 15:34:19 +0000
Subject: [PATCH] Added tests for 193 and 170. Removed unused line of code
from fx.
---
build/test/index.html | 63 +++++++++++++++++++++++++------------------------
src/fx/fx.js | 2 --
src/jquery/jquery.js | 16 +++++++++++++
3 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/build/test/index.html b/build/test/index.html
index 5666d6e..d79ba4e 100644
--- 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(){
+ $(document).ready(function(){
runTest(function() {
- {TESTS}
- });
+ {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>
- <p id="first">Try them out:</p>
+ </div>
+ <p id="first">Try them out:</p>
<ul id="firstUL"></ul>
<ol id="empty"></ol>
- <form id="form" action="formaction">
+ <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"/>
-
- <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>
+ <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 6bbc772..3fd4990 100644
--- 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 2ddb919..686c20d 100644
--- 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
--
1.7.10.4