Skip to content
Browse files

Effects: Making sure outerHeight and outerWidth make it through to th…

…e .size() implementation in all cases - Fixes IE8 effects failure
  • Loading branch information...
1 parent d3bc471 commit a217bd3b160960f8d2ffb9f6a72df7e408c7a52e @gnarf gnarf committed Nov 22, 2012
Showing with 24 additions and 7 deletions.
  1. +24 −7 ui/jquery.ui.effect-scale.js
View
31 ui/jquery.ui.effect-scale.js
@@ -21,7 +21,9 @@ $.effects.effect.puff = function( o, done ) {
factor = percent / 100,
original = {
height: elem.height(),
- width: elem.width()
+ width: elem.width(),
+ outerHeight: elem.outerHeight(),
+ outerWidth: elem.outerWidth()
};
$.extend( o, {
@@ -35,7 +37,9 @@ $.effects.effect.puff = function( o, done ) {
original :
{
height: original.height * factor,
- width: original.width * factor
+ width: original.width * factor,
+ outerHeight: original.outerHeight * factor,
+ outerWidth: original.outerWidth * factor
}
});
@@ -74,7 +78,12 @@ $.effects.effect.scale = function( o, done ) {
options.restore = true;
}
- options.from = o.from || ( mode === "show" ? { height: 0, width: 0 } : original );
+ options.from = o.from || ( mode === "show" ? {
+ height: 0,
+ width: 0,
+ outerHeight: 0,
+ outerWidth: 0
+ } : original );
options.to = {
height: original.height * factor.y,
width: original.width * factor.x,
@@ -124,7 +133,9 @@ $.effects.effect.size = function( o, done ) {
props = restore ? props0 : props1,
zero = {
height: 0,
- width: 0
+ width: 0,
+ outerHeight: 0,
+ outerWidth: 0
};
if ( mode === "show" ) {
@@ -213,19 +224,25 @@ $.effects.effect.size = function( o, done ) {
var child = $( this ),
c_original = {
height: child.height(),
- width: child.width()
+ width: child.width(),
+ outerHeight: child.outerHeight(),
+ outerWidth: child.outerWidth()
};
if (restore) {
$.effects.save(child, props2);
}
child.from = {
height: c_original.height * factor.from.y,
- width: c_original.width * factor.from.x
+ width: c_original.width * factor.from.x,
+ outerHeight: c_original.outerHeight * factor.from.y,
+ outerWidth: c_original.outerWidth * factor.from.x
};
child.to = {
height: c_original.height * factor.to.y,
- width: c_original.width * factor.to.x
+ width: c_original.width * factor.to.x,
+ outerHeight: c_original.height * factor.to.y,
+ outerWidth: c_original.width * factor.to.x
};
// Vertical props scaling

0 comments on commit a217bd3

Please sign in to comment.
Something went wrong with that request. Please try again.