@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | wp_enqueue_script( 'kirki_auto_postmessage', trailingslashit( Kirki::$url ) . 'modules/postmessage/postmessage.js', array( 'jquery', 'customize-preview' ), KIRKI_VERSION, true ); |
75 | 75 | $fields = Kirki::$fields; |
76 | 76 | foreach ( $fields as $field ) { |
77 | - if ( isset( $field['transport'] ) && 'postMessage' === $field['transport'] && isset( $field['js_vars'] ) && ! empty( $field['js_vars'] ) && is_array( $field['js_vars'] ) && isset( $field['settings'] ) ) { |
|
77 | + if ( isset( $field[ 'transport' ] ) && 'postMessage' === $field[ 'transport' ] && isset( $field[ 'js_vars' ] ) && ! empty( $field[ 'js_vars' ] ) && is_array( $field[ 'js_vars' ] ) && isset( $field[ 'settings' ] ) ) { |
|
78 | 78 | $this->script .= $this->script( $field ); |
79 | 79 | } |
80 | 80 | } |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | * @param array $args The arguments. |
91 | 91 | */ |
92 | 92 | protected function script( $args ) { |
93 | - $script = 'wp.customize(\'' . $args['settings'] . '\',function(value){value.bind(function(newval){'; |
|
93 | + $script = 'wp.customize(\'' . $args[ 'settings' ] . '\',function(value){value.bind(function(newval){'; |
|
94 | 94 | |
95 | 95 | $add_css = false; |
96 | - foreach ( $args['js_vars'] as $js_var ) { |
|
97 | - if ( ! isset( $js_var['function'] ) || 'html' !== $js_var['function'] ) { |
|
96 | + foreach ( $args[ 'js_vars' ] as $js_var ) { |
|
97 | + if ( ! isset( $js_var[ 'function' ] ) || 'html' !== $js_var[ 'function' ] ) { |
|
98 | 98 | $add_css = true; |
99 | 99 | } |
100 | 100 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | // append unique style tag if not exist |
105 | 105 | // The style ID. |
106 | - $style_id = 'kirki-postmessage-' . str_replace( array( '[', ']' ), '', $args['settings'] ); |
|
106 | + $style_id = 'kirki-postmessage-' . str_replace( array( '[', ']' ), '', $args[ 'settings' ] ); |
|
107 | 107 | $script .= 'if(null===document.getElementById(\'' . $style_id . '\')||\'undefined\'===typeof document.getElementById(\'' . $style_id . '\')){jQuery(\'head\').append(\'<style id="' . $style_id . '"></style>\');}'; |
108 | 108 | } |
109 | 109 | |
@@ -115,48 +115,48 @@ discard block |
||
115 | 115 | ); |
116 | 116 | |
117 | 117 | // Loop through the js_vars and generate the script. |
118 | - foreach ( $args['js_vars'] as $key => $js_var ) { |
|
118 | + foreach ( $args[ 'js_vars' ] as $key => $js_var ) { |
|
119 | 119 | |
120 | 120 | // Skip styles if "exclude" is defined and value is excluded. |
121 | - if ( isset( $js_var['exclude'] ) ) { |
|
122 | - $js_var['exclude'] = (array) $js_var['exclude']; |
|
121 | + if ( isset( $js_var[ 'exclude' ] ) ) { |
|
122 | + $js_var[ 'exclude' ] = (array) $js_var[ 'exclude' ]; |
|
123 | 123 | $script .= 'exclude=false;'; |
124 | - foreach ( $js_var['exclude'] as $exclussion ) { |
|
124 | + foreach ( $js_var[ 'exclude' ] as $exclussion ) { |
|
125 | 125 | $script .= "if(newval=='{$exclussion}'||(''==='{$exclussion}'&&_.isObject(newval)&&_.isEmpty(newval))){exclude=true;}"; |
126 | 126 | } |
127 | 127 | } |
128 | - if ( isset( $js_var['element'] ) ) { |
|
128 | + if ( isset( $js_var[ 'element' ] ) ) { |
|
129 | 129 | |
130 | 130 | // Array to string. |
131 | - if ( is_array( $js_var['element'] ) ) { |
|
132 | - $js_var['element'] = implode( ',', $js_var['element'] ); |
|
131 | + if ( is_array( $js_var[ 'element' ] ) ) { |
|
132 | + $js_var[ 'element' ] = implode( ',', $js_var[ 'element' ] ); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | // Replace single quotes with double quotes to avoid issues with the compiled JS. |
136 | - $js_var['element'] = str_replace( '\'', '"', $js_var['element'] ); |
|
136 | + $js_var[ 'element' ] = str_replace( '\'', '"', $js_var[ 'element' ] ); |
|
137 | 137 | } |
138 | - if ( isset( $js_var['function'] ) && 'html' === $js_var['function'] ) { |
|
138 | + if ( isset( $js_var[ 'function' ] ) && 'html' === $js_var[ 'function' ] ) { |
|
139 | 139 | $script .= $this->script_html_var( $js_var ); |
140 | 140 | continue; |
141 | 141 | } |
142 | - $js_var['index_key'] = $key; |
|
142 | + $js_var[ 'index_key' ] = $key; |
|
143 | 143 | $callback = $this->get_callback( $args ); |
144 | 144 | if ( is_callable( $callback ) ) { |
145 | - $field['scripts'][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
145 | + $field[ 'scripts' ][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
146 | 146 | continue; |
147 | 147 | } |
148 | - $field['scripts'][ $key ] = $this->script_var( $js_var ); |
|
148 | + $field[ 'scripts' ][ $key ] = $this->script_var( $js_var ); |
|
149 | 149 | } |
150 | 150 | $combo_extra_script = ''; |
151 | 151 | $combo_css_script = ''; |
152 | - foreach ( $field['scripts'] as $script_array ) { |
|
153 | - $combo_extra_script .= $script_array['script']; |
|
154 | - $combo_css_script .= ( 'css' !== $combo_css_script ) ? $script_array['css'] : ''; |
|
152 | + foreach ( $field[ 'scripts' ] as $script_array ) { |
|
153 | + $combo_extra_script .= $script_array[ 'script' ]; |
|
154 | + $combo_css_script .= ( 'css' !== $combo_css_script ) ? $script_array[ 'css' ] : ''; |
|
155 | 155 | } |
156 | 156 | $text = ( 'css' === $combo_css_script ) ? 'css' : '\'' . $combo_css_script . '\''; |
157 | 157 | |
158 | 158 | $script .= $combo_extra_script . "var cssContent={$text};"; |
159 | - if ( isset( $js_var['exclude'] ) ) { |
|
159 | + if ( isset( $js_var[ 'exclude' ] ) ) { |
|
160 | 160 | $script .= 'if(true===exclude){cssContent="";}'; |
161 | 161 | } |
162 | 162 | if ( $add_css ) { |
@@ -174,18 +174,18 @@ discard block |
||
174 | 174 | * @param array $args The arguments for this js_var. |
175 | 175 | */ |
176 | 176 | protected function script_html_var( $args ) { |
177 | - $script = ( isset( $args['choice'] ) ) ? "newval=newval['{$args['choice']}'];" : ''; |
|
177 | + $script = ( isset( $args[ 'choice' ] ) ) ? "newval=newval['{$args[ 'choice' ]}'];" : ''; |
|
178 | 178 | |
179 | 179 | // Apply the value_pattern. |
180 | - if ( isset( $args['value_pattern'] ) && '' !== $args['value_pattern'] ) { |
|
180 | + if ( isset( $args[ 'value_pattern' ] ) && '' !== $args[ 'value_pattern' ] ) { |
|
181 | 181 | $script .= $this->value_pattern_replacements( 'newval', $args ); |
182 | 182 | } |
183 | 183 | |
184 | - if ( isset( $args['attr'] ) ) { |
|
185 | - $script .= "jQuery('{$args['element']}').attr('{$args['attr']}',newval);"; |
|
184 | + if ( isset( $args[ 'attr' ] ) ) { |
|
185 | + $script .= "jQuery('{$args[ 'element' ]}').attr('{$args[ 'attr' ]}',newval);"; |
|
186 | 186 | return $script; |
187 | 187 | } |
188 | - $script .= "jQuery('{$args['element']}').html(newval);"; |
|
188 | + $script .= "jQuery('{$args[ 'element' ]}').html(newval);"; |
|
189 | 189 | return $script; |
190 | 190 | } |
191 | 191 | |
@@ -200,34 +200,34 @@ discard block |
||
200 | 200 | $script = ''; |
201 | 201 | $property_script = ''; |
202 | 202 | |
203 | - $value_key = 'newval' . $args['index_key']; |
|
203 | + $value_key = 'newval' . $args[ 'index_key' ]; |
|
204 | 204 | $property_script .= $value_key . '=newval;'; |
205 | 205 | |
206 | 206 | $args = $this->get_args( $args ); |
207 | 207 | |
208 | 208 | // Apply callback to the value if a callback is defined. |
209 | - if ( ! empty( $args['js_callback'] ) && is_array( $args['js_callback'] ) && isset( $args['js_callback'][0] ) && ! empty( $args['js_callback'][0] ) ) { |
|
210 | - $script .= $value_key . '=' . $args['js_callback'][0] . '(' . $value_key . ',' . $args['js_callback'][1] . ');'; |
|
209 | + if ( ! empty( $args[ 'js_callback' ] ) && is_array( $args[ 'js_callback' ] ) && isset( $args[ 'js_callback' ][ 0 ] ) && ! empty( $args[ 'js_callback' ][ 0 ] ) ) { |
|
210 | + $script .= $value_key . '=' . $args[ 'js_callback' ][ 0 ] . '(' . $value_key . ',' . $args[ 'js_callback' ][ 1 ] . ');'; |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | // Apply the value_pattern. |
214 | - if ( '' !== $args['value_pattern'] ) { |
|
214 | + if ( '' !== $args[ 'value_pattern' ] ) { |
|
215 | 215 | $script .= $this->value_pattern_replacements( $value_key, $args ); |
216 | 216 | } |
217 | 217 | |
218 | 218 | // Tweak to add url() for background-images. |
219 | - if ( 'background-image' === $args['property'] && ( ! isset( $args['value_pattern'] ) || false === strpos( $args['value_pattern'], 'gradient' ) ) ) { |
|
219 | + if ( 'background-image' === $args[ 'property' ] && ( ! isset( $args[ 'value_pattern' ] ) || false === strpos( $args[ 'value_pattern' ], 'gradient' ) ) ) { |
|
220 | 220 | $script .= 'if(-1===' . $value_key . '.indexOf(\'url(\')){' . $value_key . '=\'url("\'+' . $value_key . '+\'")\';}'; |
221 | 221 | } |
222 | 222 | |
223 | 223 | // Apply prefix. |
224 | 224 | $value = $value_key; |
225 | - if ( '' !== $args['prefix'] ) { |
|
226 | - $value = "'" . $args['prefix'] . "'+" . $value_key; |
|
225 | + if ( '' !== $args[ 'prefix' ] ) { |
|
226 | + $value = "'" . $args[ 'prefix' ] . "'+" . $value_key; |
|
227 | 227 | } |
228 | - $css = $args['element'] . '{' . $args['property'] . ':\'+' . $value . '+\'' . $args['units'] . $args['suffix'] . ';}'; |
|
229 | - if ( isset( $args['media_query'] ) ) { |
|
230 | - $css = $args['media_query'] . '{' . $css . '}'; |
|
228 | + $css = $args[ 'element' ] . '{' . $args[ 'property' ] . ':\'+' . $value . '+\'' . $args[ 'units' ] . $args[ 'suffix' ] . ';}'; |
|
229 | + if ( isset( $args[ 'media_query' ] ) ) { |
|
230 | + $css = $args[ 'media_query' ] . '{' . $css . '}'; |
|
231 | 231 | } |
232 | 232 | return array( |
233 | 233 | 'script' => $property_script . $script, |
@@ -243,42 +243,42 @@ discard block |
||
243 | 243 | * @param array $args The arguments for this js_var. |
244 | 244 | */ |
245 | 245 | protected function script_var_array( $args ) { |
246 | - $script = ( 0 === $args['index_key'] ) ? 'css=\'\';' : ''; |
|
246 | + $script = ( 0 === $args[ 'index_key' ] ) ? 'css=\'\';' : ''; |
|
247 | 247 | $property_script = ''; |
248 | 248 | |
249 | 249 | // Define choice. |
250 | - $choice = ( isset( $args['choice'] ) && '' !== $args['choice'] ) ? $args['choice'] : ''; |
|
250 | + $choice = ( isset( $args[ 'choice' ] ) && '' !== $args[ 'choice' ] ) ? $args[ 'choice' ] : ''; |
|
251 | 251 | |
252 | - $value_key = 'newval' . $args['index_key']; |
|
252 | + $value_key = 'newval' . $args[ 'index_key' ]; |
|
253 | 253 | $property_script .= $value_key . '=newval;'; |
254 | 254 | |
255 | 255 | $args = $this->get_args( $args ); |
256 | 256 | |
257 | 257 | // Apply callback to the value if a callback is defined. |
258 | - if ( ! empty( $args['js_callback'] ) && is_array( $args['js_callback'] ) && isset( $args['js_callback'][0] ) && ! empty( $args['js_callback'][0] ) ) { |
|
259 | - $script .= $value_key . '=' . $args['js_callback'][0] . '(' . $value_key . ',' . $args['js_callback'][1] . ');'; |
|
258 | + if ( ! empty( $args[ 'js_callback' ] ) && is_array( $args[ 'js_callback' ] ) && isset( $args[ 'js_callback' ][ 0 ] ) && ! empty( $args[ 'js_callback' ][ 0 ] ) ) { |
|
259 | + $script .= $value_key . '=' . $args[ 'js_callback' ][ 0 ] . '(' . $value_key . ',' . $args[ 'js_callback' ][ 1 ] . ');'; |
|
260 | 260 | } |
261 | 261 | $script .= '_.each(' . $value_key . ', function(subValue,subKey){'; |
262 | 262 | |
263 | 263 | // Apply the value_pattern. |
264 | - if ( '' !== $args['value_pattern'] ) { |
|
264 | + if ( '' !== $args[ 'value_pattern' ] ) { |
|
265 | 265 | $script .= $this->value_pattern_replacements( 'subValue', $args ); |
266 | 266 | } |
267 | 267 | |
268 | 268 | // Tweak to add url() for background-images. |
269 | 269 | if ( '' === $choice || 'background-image' === $choice ) { |
270 | - $script .= 'if(\'background-image\'===\'' . $args['property'] . '\'||\'background-image\'===subKey){if(-1===subValue.indexOf(\'url(\')){subValue=\'url("\'+subValue+\'")\';}}'; |
|
270 | + $script .= 'if(\'background-image\'===\'' . $args[ 'property' ] . '\'||\'background-image\'===subKey){if(-1===subValue.indexOf(\'url(\')){subValue=\'url("\'+subValue+\'")\';}}'; |
|
271 | 271 | } |
272 | 272 | |
273 | 273 | // Apply prefix. |
274 | 274 | $value = $value_key; |
275 | - if ( '' !== $args['prefix'] ) { |
|
276 | - $value = '\'' . $args['prefix'] . '\'+subValue'; |
|
275 | + if ( '' !== $args[ 'prefix' ] ) { |
|
276 | + $value = '\'' . $args[ 'prefix' ] . '\'+subValue'; |
|
277 | 277 | } |
278 | 278 | |
279 | 279 | // Mostly used for padding, margin & position properties. |
280 | 280 | $direction_script = 'if(_.contains([\'top\',\'bottom\',\'left\',\'right\'],subKey)){'; |
281 | - $direction_script .= 'css+=\'' . $args['element'] . '{' . $args['property'] . '-\'+subKey+\':\'+subValue+\'' . $args['units'] . $args['suffix'] . ';}\';}'; |
|
281 | + $direction_script .= 'css+=\'' . $args[ 'element' ] . '{' . $args[ 'property' ] . '-\'+subKey+\':\'+subValue+\'' . $args[ 'units' ] . $args[ 'suffix' ] . ';}\';}'; |
|
282 | 282 | |
283 | 283 | // Allows us to apply this just for a specific choice in the array of the values. |
284 | 284 | if ( '' !== $choice ) { |
@@ -287,18 +287,18 @@ discard block |
||
287 | 287 | // The script. |
288 | 288 | $script .= 'if(\'' . $choice . '\'===subKey){'; |
289 | 289 | $script .= ( $choice_is_direction ) ? $direction_script . 'else{' : ''; |
290 | - $script .= 'css+=\'' . $args['element'] . '{' . $args['property'] . ':\'+subValue+\';}\';'; |
|
290 | + $script .= 'css+=\'' . $args[ 'element' ] . '{' . $args[ 'property' ] . ':\'+subValue+\';}\';'; |
|
291 | 291 | $script .= ( $choice_is_direction ) ? '}' : ''; |
292 | 292 | $script .= '}'; |
293 | 293 | } else { |
294 | 294 | |
295 | 295 | // This is where most object-based fields will go. |
296 | - $script .= $direction_script . 'else{css+=\'' . $args['element'] . '{\'+subKey+\':\'+subValue+\'' . $args['units'] . $args['suffix'] . ';}\';}'; |
|
296 | + $script .= $direction_script . 'else{css+=\'' . $args[ 'element' ] . '{\'+subKey+\':\'+subValue+\'' . $args[ 'units' ] . $args[ 'suffix' ] . ';}\';}'; |
|
297 | 297 | } |
298 | 298 | $script .= '});'; |
299 | 299 | |
300 | - if ( isset( $args['media_query'] ) ) { |
|
301 | - $script .= 'css=\'' . $args['media_query'] . '{\'+css+\'}\';'; |
|
300 | + if ( isset( $args[ 'media_query' ] ) ) { |
|
301 | + $script .= 'css=\'' . $args[ 'media_query' ] . '{\'+css+\'}\';'; |
|
302 | 302 | } |
303 | 303 | |
304 | 304 | return array( |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | $webfont_loader = 'sc=\'a\';jQuery(\'head\').append(sc.replace(\'a\',\'<\')+\'script>if(!_.isUndefined(WebFont)&&fontFamily){WebFont.load({google:{families:["\'+fontFamily.replace( /\"/g, \'"\' )+\':\'+variant+\'cyrillic,cyrillic-ext,devanagari,greek,greek-ext,khmer,latin,latin-ext,vietnamese,hebrew,arabic,bengali,gujarati,tamil,telugu,thai"]}});}\'+sc.replace(\'a\',\'<\')+\'/script>\');'; |
327 | 327 | |
328 | 328 | // Add the css. |
329 | - $css_build_array = array( |
|
329 | + $css_build_array = array( |
|
330 | 330 | 'font-family' => 'fontFamily', |
331 | 331 | 'font-size' => 'fontSize', |
332 | 332 | 'line-height' => 'lineHeight', |
@@ -339,41 +339,41 @@ discard block |
||
339 | 339 | 'font-weight' => 'fontWeight', |
340 | 340 | 'font-style' => 'fontStyle', |
341 | 341 | ); |
342 | - $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[ $args['choice'] ] ) ); |
|
342 | + $choice_condition = ( isset( $args[ 'choice' ] ) && '' !== $args[ 'choice' ] && isset( $css_build_array[ $args[ 'choice' ] ] ) ); |
|
343 | 343 | $script .= ( ! $choice_condition ) ? $webfont_loader : ''; |
344 | 344 | foreach ( $css_build_array as $property => $var ) { |
345 | - if ( $choice_condition && $property !== $args['choice'] ) { |
|
345 | + if ( $choice_condition && $property !== $args[ 'choice' ] ) { |
|
346 | 346 | continue; |
347 | 347 | } |
348 | 348 | // Fixes https://github.com/aristath/kirki/issues/1436. |
349 | - if ( ! isset( $field['default'] ) || ( |
|
350 | - ( 'font-family' === $property && ! isset( $field['default']['font-family'] ) ) || |
|
351 | - ( 'font-size' === $property && ! isset( $field['default']['font-size'] ) ) || |
|
352 | - ( 'line-height' === $property && ! isset( $field['default']['line-height'] ) ) || |
|
353 | - ( 'letter-spacing' === $property && ! isset( $field['default']['letter-spacing'] ) ) || |
|
354 | - ( 'word-spacing' === $property && ! isset( $field['default']['word-spacing'] ) ) || |
|
355 | - ( 'text-align' === $property && ! isset( $field['default']['text-align'] ) ) || |
|
356 | - ( 'text-transform' === $property && ! isset( $field['default']['text-transform'] ) ) || |
|
357 | - ( 'text-decoration' === $property && ! isset( $field['default']['text-decoration'] ) ) || |
|
358 | - ( 'color' === $property && ! isset( $field['default']['color'] ) ) || |
|
359 | - ( 'font-weight' === $property && ! isset( $field['default']['variant'] ) && ! isset( $field['default']['font-weight'] ) ) || |
|
360 | - ( 'font-style' === $property && ! isset( $field['default']['variant'] ) && ! isset( $field['default']['font-style'] ) ) |
|
349 | + if ( ! isset( $field[ 'default' ] ) || ( |
|
350 | + ( 'font-family' === $property && ! isset( $field[ 'default' ][ 'font-family' ] ) ) || |
|
351 | + ( 'font-size' === $property && ! isset( $field[ 'default' ][ 'font-size' ] ) ) || |
|
352 | + ( 'line-height' === $property && ! isset( $field[ 'default' ][ 'line-height' ] ) ) || |
|
353 | + ( 'letter-spacing' === $property && ! isset( $field[ 'default' ][ 'letter-spacing' ] ) ) || |
|
354 | + ( 'word-spacing' === $property && ! isset( $field[ 'default' ][ 'word-spacing' ] ) ) || |
|
355 | + ( 'text-align' === $property && ! isset( $field[ 'default' ][ 'text-align' ] ) ) || |
|
356 | + ( 'text-transform' === $property && ! isset( $field[ 'default' ][ 'text-transform' ] ) ) || |
|
357 | + ( 'text-decoration' === $property && ! isset( $field[ 'default' ][ 'text-decoration' ] ) ) || |
|
358 | + ( 'color' === $property && ! isset( $field[ 'default' ][ 'color' ] ) ) || |
|
359 | + ( 'font-weight' === $property && ! isset( $field[ 'default' ][ 'variant' ] ) && ! isset( $field[ 'default' ][ 'font-weight' ] ) ) || |
|
360 | + ( 'font-style' === $property && ! isset( $field[ 'default' ][ 'variant' ] ) && ! isset( $field[ 'default' ][ 'font-style' ] ) ) |
|
361 | 361 | ) ) { |
362 | 362 | continue; |
363 | 363 | } |
364 | - $script .= ( $choice_condition && 'font-family' === $args['choice'] ) ? $webfont_loader : ''; |
|
364 | + $script .= ( $choice_condition && 'font-family' === $args[ 'choice' ] ) ? $webfont_loader : ''; |
|
365 | 365 | |
366 | - if ( 'font-family' === $property || ( isset( $args['choice'] ) && 'font-family' === $args['choice'] ) ) { |
|
366 | + if ( 'font-family' === $property || ( isset( $args[ 'choice' ] ) && 'font-family' === $args[ 'choice' ] ) ) { |
|
367 | 367 | $css .= 'fontFamilyCSS=fontFamily;if(0<fontFamily.indexOf(\' \')&&-1===fontFamily.indexOf(\'"\')){fontFamilyCSS=\'"\'+fontFamily+\'"\';}'; |
368 | 368 | $var = 'fontFamilyCSS'; |
369 | 369 | } |
370 | - $var = ( ( empty( $args['prefix'] ) ) ? '' : '\'' . $args['prefix'] . '\'+' ) . $var . ( ( empty( $args['units'] ) ) ? '' : '+\'' . $args['units'] . '\'' ) . ( ( empty( $args['suffix'] ) ) ? '' : '+\'' . $args['suffix'] . '\'' ); |
|
371 | - $css .= 'css+=(\'\'!==' . $var . ')?\'' . $args['element'] . '\'+\'{' . $property . ':\'+' . $var . '+\';}\':\'\';'; |
|
370 | + $var = ( ( empty( $args[ 'prefix' ] ) ) ? '' : '\'' . $args[ 'prefix' ] . '\'+' ) . $var . ( ( empty( $args[ 'units' ] ) ) ? '' : '+\'' . $args[ 'units' ] . '\'' ) . ( ( empty( $args[ 'suffix' ] ) ) ? '' : '+\'' . $args[ 'suffix' ] . '\'' ); |
|
371 | + $css .= 'css+=(\'\'!==' . $var . ')?\'' . $args[ 'element' ] . '\'+\'{' . $property . ':\'+' . $var . '+\';}\':\'\';'; |
|
372 | 372 | } |
373 | 373 | |
374 | 374 | $script .= $css; |
375 | - if ( isset( $args['media_query'] ) ) { |
|
376 | - $script .= 'css=\'' . $args['media_query'] . '{\'+css+\'}\';'; |
|
375 | + if ( isset( $args[ 'media_query' ] ) ) { |
|
376 | + $script .= 'css=\'' . $args[ 'media_query' ] . '{\'+css+\'}\';'; |
|
377 | 377 | } |
378 | 378 | return array( |
379 | 379 | 'script' => $script, |
@@ -391,8 +391,8 @@ discard block |
||
391 | 391 | protected function script_var_image( $args ) { |
392 | 392 | $return = $this->script_var( $args ); |
393 | 393 | return array( |
394 | - 'script' => 'newval=(!_.isUndefined(newval.url))?newval.url:newval;' . $return['script'], |
|
395 | - 'css' => $return['css'], |
|
394 | + 'script' => 'newval=(!_.isUndefined(newval.url))?newval.url:newval;' . $return[ 'script' ], |
|
395 | + 'css' => $return[ 'css' ], |
|
396 | 396 | ); |
397 | 397 | } |
398 | 398 | |
@@ -406,8 +406,8 @@ discard block |
||
406 | 406 | */ |
407 | 407 | private function before_script( $args ) { |
408 | 408 | $script = ''; |
409 | - if ( isset( $args['type'] ) ) { |
|
410 | - switch ( $args['type'] ) { |
|
409 | + if ( isset( $args[ 'type' ] ) ) { |
|
410 | + switch ( $args[ 'type' ] ) { |
|
411 | 411 | case 'kirki-typography': |
412 | 412 | $script .= 'fontFamily=(_.isUndefined(newval[\'font-family\']))?\'\':newval[\'font-family\'];variant=(_.isUndefined(newval.variant))?\'400\':newval.variant;fontSize=(_.isUndefined(newval[\'font-size\']))?\'\':newval[\'font-size\'];lineHeight=(_.isUndefined(newval[\'line-height\']))?\'\':newval[\'line-height\'];letterSpacing=(_.isUndefined(newval[\'letter-spacing\']))?\'\':newval[\'letter-spacing\'];wordSpacing=(_.isUndefined(newval[\'word-spacing\']))?\'\':newval[\'word-spacing\'];textAlign=(_.isUndefined(newval[\'text-align\']))?\'\':newval[\'text-align\'];textTransform=(_.isUndefined(newval[\'text-transform\']))?\'\':newval[\'text-transform\'];textDecoration=(_.isUndefined(newval[\'text-decoration\']))?\'\':newval[\'text-decoration\'];color=(_.isUndefined(newval.color))?\'\':newval.color;fw=(!_.isString(newval.variant))?\'400\':newval.variant.match(/\d/g);fontWeight=(!_.isObject(fw))?400:fw.join(\'\');fontStyle=(variant&&-1!==variant.indexOf(\'italic\'))?\'italic\':\'normal\';css=\'\';'; |
413 | 413 | break; |
@@ -440,17 +440,17 @@ discard block |
||
440 | 440 | ); |
441 | 441 | |
442 | 442 | // Element should be a string. |
443 | - if ( is_array( $args['element'] ) ) { |
|
444 | - $args['element'] = implode( ',', $args['element'] ); |
|
443 | + if ( is_array( $args[ 'element' ] ) ) { |
|
444 | + $args[ 'element' ] = implode( ',', $args[ 'element' ] ); |
|
445 | 445 | } |
446 | 446 | |
447 | 447 | // Make sure arguments that are passed-on to callbacks are strings. |
448 | - if ( is_array( $args['js_callback'] ) && isset( $args['js_callback'][1] ) && is_array( $args['js_callback'][1] ) ) { |
|
449 | - $args['js_callback'][1] = wp_json_encode( $args['js_callback'][1] ); |
|
448 | + if ( is_array( $args[ 'js_callback' ] ) && isset( $args[ 'js_callback' ][ 1 ] ) && is_array( $args[ 'js_callback' ][ 1 ] ) ) { |
|
449 | + $args[ 'js_callback' ][ 1 ] = wp_json_encode( $args[ 'js_callback' ][ 1 ] ); |
|
450 | 450 | } |
451 | 451 | |
452 | - if ( ! isset( $args['js_callback'][1] ) ) { |
|
453 | - $args['js_callback'][1] = ''; |
|
452 | + if ( ! isset( $args[ 'js_callback' ][ 1 ] ) ) { |
|
453 | + $args[ 'js_callback' ][ 1 ] = ''; |
|
454 | 454 | } |
455 | 455 | return $args; |
456 | 456 | } |
@@ -467,15 +467,15 @@ discard block |
||
467 | 467 | private function value_pattern_replacements( $value, $js_vars ) { |
468 | 468 | $script = ''; |
469 | 469 | $alias = $value; |
470 | - if ( ! isset( $js_vars['value_pattern'] ) ) { |
|
470 | + if ( ! isset( $js_vars[ 'value_pattern' ] ) ) { |
|
471 | 471 | return $value; |
472 | 472 | } |
473 | - $value = $js_vars['value_pattern']; |
|
474 | - if ( isset( $js_vars['pattern_replace'] ) ) { |
|
473 | + $value = $js_vars[ 'value_pattern' ]; |
|
474 | + if ( isset( $js_vars[ 'pattern_replace' ] ) ) { |
|
475 | 475 | $script .= 'settings=window.wp.customize.get();'; |
476 | - foreach ( $js_vars['pattern_replace'] as $search => $replace ) { |
|
476 | + foreach ( $js_vars[ 'pattern_replace' ] as $search => $replace ) { |
|
477 | 477 | $replace = '\'+settings["' . $replace . '"]+\''; |
478 | - $value = str_replace( $search, $replace, $js_vars['value_pattern'] ); |
|
478 | + $value = str_replace( $search, $replace, $js_vars[ 'value_pattern' ] ); |
|
479 | 479 | $value = trim( $value, '+' ); |
480 | 480 | } |
481 | 481 | } |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | * @return string|array A callable function or method. |
495 | 495 | */ |
496 | 496 | protected function get_callback( $args ) { |
497 | - switch ( $args['type'] ) { |
|
497 | + switch ( $args[ 'type' ] ) { |
|
498 | 498 | case 'kirki-background': |
499 | 499 | case 'kirki-dimensions': |
500 | 500 | case 'kirki-multicolor': |