From 6f7cd669597cbcf026886074fb31963fe767e2b3 Mon Sep 17 00:00:00 2001 From: Brandon Aaron 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 5666d6e0..d79ba4e2 100644 --- a/build/test/index.html +++ b/build/test/index.html @@ -3,10 +3,10 @@ @@ -30,11 +30,11 @@

This is a normal link: Yahoo

This link has class="blog": Simon Willison's Weblog

- -

Try them out:

+ +

Try them out:

    -
    + @@ -44,33 +44,34 @@ - - - - - - - - - - - + + + + + + + + + +
    +

    Float test. diff --git a/src/fx/fx.js b/src/fx/fx.js index 6bbc772e..3fd49902 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 2ddb919c..686c20d7 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