@@ -156,27 +156,27 @@ test("css(String, Object)", function() {
156156} ) ;
157157
158158if ( ! jQuery . support . opacity ) {
159- test ( "css(String, Object) for MSIE" , function ( ) {
160- // for #1438, IE throws JS error when filter exists but doesn't have opacity in it
159+ test ( "css(String, Object) for MSIE" , function ( ) {
160+ // for #1438, IE throws JS error when filter exists but doesn't have opacity in it
161161 jQuery ( '#foo' ) . css ( "filter" , "progid:DXImageTransform.Microsoft.Chroma(color='red');" ) ;
162- equals ( jQuery ( '#foo' ) . css ( 'opacity' ) , '1' , "Assert opacity is 1 when a different filter is set in IE, #1438" ) ;
163-
164- var filterVal = "progid:DXImageTransform.Microsoft.Alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)" ;
165- var filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)" ;
166- var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)" ;
167- jQuery ( '#foo' ) . css ( "filter" , filterVal ) ;
168- equals ( jQuery ( '#foo' ) . css ( "filter" ) , filterVal , "css('filter', val) works" ) ;
169- jQuery ( '#foo' ) . css ( "opacity" , 1 ) ;
170- equals ( jQuery ( '#foo' ) . css ( "filter" ) , filterVal2 , "Setting opacity in IE doesn't duplicate opacity filter" ) ;
171- equals ( jQuery ( '#foo' ) . css ( "opacity" ) , 1 , "Setting opacity in IE with other filters works" ) ;
172- jQuery ( '#foo' ) . css ( "filter" , filterVal3 ) . css ( "opacity" , 1 ) ;
173- ok ( jQuery ( '#foo' ) . css ( "filter" ) . indexOf ( filterVal3 ) !== - 1 , "Setting opacity in IE doesn't clobber other filters" ) ;
174- } ) ;
162+ equals ( jQuery ( '#foo' ) . css ( 'opacity' ) , '1' , "Assert opacity is 1 when a different filter is set in IE, #1438" ) ;
163+
164+ var filterVal = "progid:DXImageTransform.Microsoft.Alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)" ;
165+ var filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)" ;
166+ var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)" ;
167+ jQuery ( '#foo' ) . css ( "filter" , filterVal ) ;
168+ equals ( jQuery ( '#foo' ) . css ( "filter" ) , filterVal , "css('filter', val) works" ) ;
169+ jQuery ( '#foo' ) . css ( "opacity" , 1 ) ;
170+ equals ( jQuery ( '#foo' ) . css ( "filter" ) , filterVal2 , "Setting opacity in IE doesn't duplicate opacity filter" ) ;
171+ equals ( jQuery ( '#foo' ) . css ( "opacity" ) , 1 , "Setting opacity in IE with other filters works" ) ;
172+ jQuery ( '#foo' ) . css ( "filter" , filterVal3 ) . css ( "opacity" , 1 ) ;
173+ ok ( jQuery ( '#foo' ) . css ( "filter" ) . indexOf ( filterVal3 ) !== - 1 , "Setting opacity in IE doesn't clobber other filters" ) ;
174+ } ) ;
175175}
176176
177177test ( "css(String, Function)" , function ( ) {
178178 expect ( 3 ) ;
179-
179+
180180 var sizes = [ "10px" , "20px" , "30px" ] ;
181181
182182 jQuery ( "<div id='cssFunctionTest'><div class='cssFunction'></div>" +
@@ -191,7 +191,7 @@ test("css(String, Function)", function() {
191191 index ++ ;
192192 return size ;
193193 } ) ;
194-
194+
195195 index = 0 ;
196196
197197 jQuery ( "#cssFunctionTest div" ) . each ( function ( ) {
@@ -206,7 +206,7 @@ test("css(String, Function)", function() {
206206
207207test ( "css(String, Function) with incoming value" , function ( ) {
208208 expect ( 3 ) ;
209-
209+
210210 var sizes = [ "10px" , "20px" , "30px" ] ;
211211
212212 jQuery ( "<div id='cssFunctionTest'><div class='cssFunction'></div>" +
@@ -221,7 +221,7 @@ test("css(String, Function) with incoming value", function() {
221221 index ++ ;
222222 return size ;
223223 } ) ;
224-
224+
225225 index = 0 ;
226226
227227 jQuery ( "#cssFunctionTest div" ) . css ( "font-size" , function ( i , computedSize ) {
@@ -236,7 +236,7 @@ test("css(String, Function) with incoming value", function() {
236236
237237test ( "css(Object) where values are Functions" , function ( ) {
238238 expect ( 3 ) ;
239-
239+
240240 var sizes = [ "10px" , "20px" , "30px" ] ;
241241
242242 jQuery ( "<div id='cssFunctionTest'><div class='cssFunction'></div>" +
@@ -251,22 +251,22 @@ test("css(Object) where values are Functions", function() {
251251 index ++ ;
252252 return size ;
253253 } } ) ;
254-
254+
255255 index = 0 ;
256-
256+
257257 jQuery ( "#cssFunctionTest div" ) . each ( function ( ) {
258258 var computedSize = jQuery ( this ) . css ( "font-size" )
259259 var expectedSize = sizes [ index ]
260260 equals ( computedSize , expectedSize , "Div #" + index + " should be " + expectedSize ) ;
261261 index ++ ;
262262 } ) ;
263-
263+
264264 jQuery ( "#cssFunctionTest" ) . remove ( ) ;
265265} ) ;
266266
267267test ( "css(Object) where values are Functions with incoming values" , function ( ) {
268268 expect ( 3 ) ;
269-
269+
270270 var sizes = [ "10px" , "20px" , "30px" ] ;
271271
272272 jQuery ( "<div id='cssFunctionTest'><div class='cssFunction'></div>" +
@@ -281,16 +281,16 @@ test("css(Object) where values are Functions with incoming values", function() {
281281 index ++ ;
282282 return size ;
283283 } } ) ;
284-
284+
285285 index = 0 ;
286-
286+
287287 jQuery ( "#cssFunctionTest div" ) . css ( { "font-size" : function ( i , computedSize ) {
288288 var expectedSize = sizes [ index ]
289289 equals ( computedSize , expectedSize , "Div #" + index + " should be " + expectedSize ) ;
290290 index ++ ;
291291 return computedSize ;
292292 } } ) ;
293-
293+
294294 jQuery ( "#cssFunctionTest" ) . remove ( ) ;
295295} ) ;
296296
0 commit comments