File tree Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Expand file tree Collapse file tree 2 files changed +8
-6
lines changed Original file line number Diff line number Diff line change 2912
2912
}
2913
2913
2914
2914
function hasLayout_IE ( element ) {
2915
- if ( ! element . currentStyle . hasLayout )
2915
+ if ( ! element . currentStyle || ! element . currentStyle . hasLayout )
2916
2916
element . style . zoom = 1 ;
2917
2917
return element ;
2918
2918
}
Original file line number Diff line number Diff line change @@ -903,7 +903,10 @@ new Test.Unit.Runner({
903
903
this . assert (
904
904
$ ( 'style_test_3' ) . setOpacity ( 0.9999999 ) . getStyle ( 'opacity' ) > 0.999
905
905
) ;
906
-
906
+
907
+ // setting opacity before element was added to DOM
908
+ this . assertEqual ( 0.5 , new Element ( 'div' ) . setOpacity ( 0.5 ) . getOpacity ( ) ) ;
909
+
907
910
/*
908
911
909
912
IE <= 7 needs a `hasLayout` for opacity ("filter") to function properly
@@ -927,10 +930,9 @@ new Test.Unit.Runner({
927
930
928
931
if ( ZOOM_AFFECT_HAS_LAYOUT ) {
929
932
this . assert ( $ ( 'style_test_4' ) . setOpacity ( 0.5 ) . currentStyle . hasLayout ) ;
930
- this . assert ( 2 , $ ( 'style_test_5' ) . setOpacity ( 0.5 ) . getStyle ( 'zoom' ) ) ;
931
- this . assert ( 0.5 , new Element ( 'div' ) . setOpacity ( 0.5 ) . getOpacity ( ) ) ;
932
- this . assert ( 2 , new Element ( 'div' ) . setOpacity ( 0.5 ) . setStyle ( 'zoom: 2;' ) . getStyle ( 'zoom' ) ) ;
933
- this . assert ( 2 , new Element ( 'div' ) . setStyle ( 'zoom: 2;' ) . setOpacity ( 0.5 ) . getStyle ( 'zoom' ) ) ;
933
+ this . assertEqual ( 1 , $ ( 'style_test_5' ) . setOpacity ( 0.5 ) . getStyle ( 'zoom' ) ) ;
934
+ this . assertEqual ( 2 , new Element ( 'div' ) . setOpacity ( 0.5 ) . setStyle ( 'zoom: 2;' ) . getStyle ( 'zoom' ) ) ;
935
+ this . assertEqual ( 2 , new Element ( 'div' ) . setStyle ( 'zoom: 2;' ) . setOpacity ( 0.5 ) . getStyle ( 'zoom' ) ) ;
934
936
}
935
937
} ,
936
938
You can’t perform that action at this time.
0 commit comments