Skip to content

Commit 188259e

Browse files
committed
Effects: Making sure outerHeight and outerWidth make it through to the .size() implementation in all cases - Fixes IE8 effects failure
(cherry picked from commit a217bd3)
1 parent a0098ea commit 188259e

File tree

1 file changed

+24
-7
lines changed

1 file changed

+24
-7
lines changed

ui/jquery.ui.effect-scale.js

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ $.effects.effect.puff = function( o, done ) {
2121
factor = percent / 100,
2222
original = {
2323
height: elem.height(),
24-
width: elem.width()
24+
width: elem.width(),
25+
outerHeight: elem.outerHeight(),
26+
outerWidth: elem.outerWidth()
2527
};
2628

2729
$.extend( o, {
@@ -35,7 +37,9 @@ $.effects.effect.puff = function( o, done ) {
3537
original :
3638
{
3739
height: original.height * factor,
38-
width: original.width * factor
40+
width: original.width * factor,
41+
outerHeight: original.outerHeight * factor,
42+
outerWidth: original.outerWidth * factor
3943
}
4044
});
4145

@@ -74,7 +78,12 @@ $.effects.effect.scale = function( o, done ) {
7478
options.restore = true;
7579
}
7680

77-
options.from = o.from || ( mode === "show" ? { height: 0, width: 0 } : original );
81+
options.from = o.from || ( mode === "show" ? {
82+
height: 0,
83+
width: 0,
84+
outerHeight: 0,
85+
outerWidth: 0
86+
} : original );
7887
options.to = {
7988
height: original.height * factor.y,
8089
width: original.width * factor.x,
@@ -124,7 +133,9 @@ $.effects.effect.size = function( o, done ) {
124133
props = restore ? props0 : props1,
125134
zero = {
126135
height: 0,
127-
width: 0
136+
width: 0,
137+
outerHeight: 0,
138+
outerWidth: 0
128139
};
129140

130141
if ( mode === "show" ) {
@@ -213,19 +224,25 @@ $.effects.effect.size = function( o, done ) {
213224
var child = $( this ),
214225
c_original = {
215226
height: child.height(),
216-
width: child.width()
227+
width: child.width(),
228+
outerHeight: child.outerHeight(),
229+
outerWidth: child.outerWidth()
217230
};
218231
if (restore) {
219232
$.effects.save(child, props2);
220233
}
221234

222235
child.from = {
223236
height: c_original.height * factor.from.y,
224-
width: c_original.width * factor.from.x
237+
width: c_original.width * factor.from.x,
238+
outerHeight: c_original.outerHeight * factor.from.y,
239+
outerWidth: c_original.outerWidth * factor.from.x
225240
};
226241
child.to = {
227242
height: c_original.height * factor.to.y,
228-
width: c_original.width * factor.to.x
243+
width: c_original.width * factor.to.x,
244+
outerHeight: c_original.height * factor.to.y,
245+
outerWidth: c_original.width * factor.to.x
229246
};
230247

231248
// Vertical props scaling

0 commit comments

Comments
 (0)