@@ -128,9 +128,19 @@ function ThemeRoller( options ) {
128
128
// TODO: Remove `filter` style when dropping support for IE8 and earlier.
129
129
vars . opacityOverlayPerc = vars . opacityOverlay ;
130
130
vars . opacityShadowPerc = vars . opacityShadow ;
131
- if ( semver . gte ( this . jqueryUi . pkg . version , "1.10.0" ) ) {
131
+ if ( semver . lt ( this . jqueryUi . pkg . version , "1.10.0" ) ) {
132
132
133
- // For version >= 1.10.0, filter has its own separate line and variable name.
133
+ // For version <1.10.0, `opacity` (W3C) and `filter` (IE) are combined
134
+ // into the same line.
135
+ opacityFix = function ( opacity ) {
136
+ return /* w3c */ ( opacity / 100 ) . toString ( ) . replace ( / ^ 0 \. / , "." ) + /* IE */ ";filter:Alpha(Opacity=" + opacity + ")" ;
137
+ } ;
138
+ vars . opacityOverlay = opacityFix ( vars . opacityOverlay ) ;
139
+ vars . opacityShadow = opacityFix ( vars . opacityShadow ) ;
140
+ } else if ( semver . lt ( this . jqueryUi . pkg . version , "1.13.0" ) ) {
141
+
142
+ // For version >=1.10.0 <1.13.0, `filter` has its own separate line
143
+ // and variable name.
134
144
opacityFix = function ( opacity ) {
135
145
return ( opacity / 100 ) . toString ( ) . replace ( / ^ 0 \. / , "." ) ;
136
146
} ;
@@ -143,10 +153,16 @@ function ThemeRoller( options ) {
143
153
vars . opacityShadow = opacityFix ( vars . opacityShadow ) ;
144
154
} else {
145
155
146
- // For version < 1.10.0, opacity (w3c) and filter (IE) are combined into the same line.
156
+ // For version >=1.13.0, `-ms-filter` has its own separate line
157
+ // and variable name.
147
158
opacityFix = function ( opacity ) {
148
- return /* w3c */ ( opacity / 100 ) . toString ( ) . replace ( / ^ 0 \. / , "." ) + /* IE */ ";filter:Alpha(Opacity=" + opacity + ")" ;
159
+ return ( opacity / 100 ) . toString ( ) . replace ( / ^ 0 \. / , "." ) ;
160
+ } ;
161
+ opacityFilter = function ( opacity ) {
162
+ return "\"alpha(opacity=" + opacity + ")\"" ;
149
163
} ;
164
+ vars . opacityFilterOverlay = opacityFilter ( vars . opacityOverlay ) ;
165
+ vars . opacityFilterShadow = opacityFilter ( vars . opacityShadow ) ;
150
166
vars . opacityOverlay = opacityFix ( vars . opacityOverlay ) ;
151
167
vars . opacityShadow = opacityFix ( vars . opacityShadow ) ;
152
168
}
@@ -210,7 +226,7 @@ function ThemeRoller( options ) {
210
226
if ( ! this . name ) {
211
227
212
228
// Pick name based on theme gallery vs. our vars
213
- themeGallery = require ( "./themeroller-themegallery" ) ( ) ;
229
+ themeGallery = require ( "./themeroller-themegallery" ) ( this . jqueryUi ) ;
214
230
themeGallery . some ( function ( theme ) {
215
231
found = theme . isEqual ( self ) ;
216
232
if ( found ) {
0 commit comments