Skip to content
Permalink
Browse files

Merge pull request #310 from gnarf37/ticket-7395

Unit Tests & effects.scale: Fixing bugs in effects unit tests - Particula
  • Loading branch information...
scottgonzalez committed May 18, 2011
2 parents 4f0f407 + 4fc5ea1 commit b76d42aad7324ae3d0d7ce37546c1ec9c933a5f5
Showing with 23 additions and 15 deletions.
  1. +3 −0 tests/unit/effects/effects.html
  2. +7 −6 tests/unit/effects/effects_core.js
  3. +1 −1 ui/jquery.effects.core.js
  4. +12 −8 ui/jquery.effects.scale.js
@@ -38,10 +38,13 @@
.test {
background: #000;
border: 0;
width: 100px;
height: 100px;
}
.testAddBorder {
border: 10px solid #000;
}
.testChildren,
.testChangeBackground {
background: #fff;
}
@@ -77,12 +77,12 @@ asyncTest( "animateClass works with colors", function() {
count = 0;
expect(2);
test.toggleClass("testChangeBackground", duration, function() {
present( test.css("backgroundColor"), [ "#ffffff", "rgb(255, 255, 255)" ], "Color is final" );
present( test.css("backgroundColor"), [ "#ffffff", "#fff", "rgb(255, 255, 255)" ], "Color is final" );
start();
});
setTimeout(function() {
var color = test.css("backgroundColor");
notPresent( color, [ "#000000", "#ffffff", "rgb(0, 0, 0)", "rgb(255,255,255)" ],
notPresent( color, [ "#000000", "#ffffff", "#000", "#fff", "rgb(0, 0, 0)", "rgb(255,255,255)" ],
"Color is not endpoints in middle." );
}, mid);
});
@@ -92,19 +92,20 @@ asyncTest( "animateClass works with children", function() {
h2 = test.find("h2");

expect(4);
setTimeout(function() {
notPresent( h2.css("fontSize"), ["10px","20px"], "Font size is neither endpoint when in middle.");
}, mid);
test.toggleClass("testChildren", { children: true, duration: duration, complete: function() {
equal( h2.css("fontSize"), "20px", "Text size is final during complete");
test.toggleClass("testChildren", duration, function() {
equal( h2.css("fontSize"), "10px", "Text size revertted after class removed");

start();
});
setTimeout(function() {
equal( h2.css("fontSize"), "20px", "Text size unchanged with children: undefined" );
equal( h2.css("fontSize"), "20px", "Text size unchanged during animate with children: undefined" );
}, mid);
}});
setTimeout(function() {
notPresent( h2.css("fontSize"), ["10px","20px"], "Font size is neither endpoint when in middle.");
}, mid);
});

})(jQuery);
@@ -451,7 +451,7 @@ $.extend( $.effects, {
setTransition: function( element, list, factor, value ) {
value = value || {};
$.each( list, function(i, x){
unit = element.cssUnit( x );
var unit = element.cssUnit( x );
if ( unit[ 0 ] > 0 ) value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
});
return value;
@@ -115,11 +115,15 @@ $.effects.effect.size = function( o ) {
restore = o.restore || false,
scale = o.scale || 'both',
origin = o.origin,
original = {
height: el.height(),
width: el.width()
},
baseline, factor;
original, baseline, factor;

if ( mode === "show" ) {
el.show();
}
original = {
height: el.height(),
width: el.width()
};

el.from = o.from || original;
el.to = o.to || original;
@@ -149,14 +153,14 @@ $.effects.effect.size = function( o ) {
if ( scale == 'box' || scale == 'both' ) {

// Vertical props scaling
if ( factor.from.y != factor.to.y ) {
if ( factor.from.y !== factor.to.y ) {
props = props.concat( vProps );
el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
};

// Horizontal props scaling
if ( factor.from.x != factor.to.x ) {
if ( factor.from.x !== factor.to.x ) {
props = props.concat( hProps );
el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
@@ -167,7 +171,7 @@ $.effects.effect.size = function( o ) {
if ( scale == 'content' || scale == 'both' ) {

// Vertical props scaling
if ( factor.from.y != factor.to.y ) {
if ( factor.from.y !== factor.to.y ) {
props = props.concat( cProps );
el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );

0 comments on commit b76d42a

Please sign in to comment.
You can’t perform that action at this time.