@@ -22,10 +22,10 @@ discard block |
||
22 | 22 | * @param array $value The field's value. |
23 | 23 | */ |
24 | 24 | protected function process_output( $output, $value ) { |
25 | - $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; |
|
26 | - $output['element'] = ( isset( $output['element'] ) ) ? $output['element'] : 'body'; |
|
27 | - $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; |
|
28 | - $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; |
|
25 | + $output[ 'media_query' ] = ( isset( $output[ 'media_query' ] ) ) ? $output[ 'media_query' ] : 'global'; |
|
26 | + $output[ 'element' ] = ( isset( $output[ 'element' ] ) ) ? $output[ 'element' ] : 'body'; |
|
27 | + $output[ 'prefix' ] = ( isset( $output[ 'prefix' ] ) ) ? $output[ 'prefix' ] : ''; |
|
28 | + $output[ 'suffix' ] = ( isset( $output[ 'suffix' ] ) ) ? $output[ 'suffix' ] : ''; |
|
29 | 29 | |
30 | 30 | $value = Kirki_Field_Typography::sanitize( $value ); |
31 | 31 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | foreach ( $properties as $property ) { |
48 | 48 | |
49 | 49 | // Early exit if the value is not in the defaults. |
50 | - if ( ! isset( $this->field['default'][ $property ] ) ) { |
|
50 | + if ( ! isset( $this->field[ 'default' ][ $property ] ) ) { |
|
51 | 51 | continue; |
52 | 52 | } |
53 | 53 | |
@@ -57,39 +57,39 @@ discard block |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | // Early exit if we use "choice" but not for this property. |
60 | - if ( isset( $output['choice'] ) && $output['choice'] !== $property ) { |
|
60 | + if ( isset( $output[ 'choice' ] ) && $output[ 'choice' ] !== $property ) { |
|
61 | 61 | continue; |
62 | 62 | } |
63 | 63 | |
64 | 64 | // Take care of variants. |
65 | - if ( 'variant' === $property && isset( $value['variant'] ) && ! empty( $value['variant'] ) ) { |
|
65 | + if ( 'variant' === $property && isset( $value[ 'variant' ] ) && ! empty( $value[ 'variant' ] ) ) { |
|
66 | 66 | |
67 | 67 | // Get the font_weight. |
68 | - $font_weight = str_replace( 'italic', '', $value['variant'] ); |
|
68 | + $font_weight = str_replace( 'italic', '', $value[ 'variant' ] ); |
|
69 | 69 | $font_weight = ( in_array( $font_weight, array( '', 'regular' ), true ) ) ? '400' : $font_weight; |
70 | 70 | |
71 | 71 | // Is this italic? |
72 | - $is_italic = ( false !== strpos( $value['variant'], 'italic' ) ); |
|
73 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $font_weight; |
|
72 | + $is_italic = ( false !== strpos( $value[ 'variant' ], 'italic' ) ); |
|
73 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ 'font-weight' ] = $font_weight; |
|
74 | 74 | if ( $is_italic ) { |
75 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['font-style'] = 'italic'; |
|
75 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ 'font-style' ] = 'italic'; |
|
76 | 76 | } |
77 | 77 | continue; |
78 | 78 | } |
79 | 79 | |
80 | 80 | $property_value = $this->process_property_value( $property, $value[ $property ] ); |
81 | 81 | if ( 'font-family' === $property ) { |
82 | - $value['font-backup'] = ( isset( $value['font-backup'] ) ) ? $value['font-backup'] : ''; |
|
82 | + $value[ 'font-backup' ] = ( isset( $value[ 'font-backup' ] ) ) ? $value[ 'font-backup' ] : ''; |
|
83 | 83 | $property_value = $this->process_property_value( |
84 | 84 | $property, array( |
85 | - $value['font-family'], |
|
86 | - $value['font-backup'], |
|
85 | + $value[ 'font-family' ], |
|
86 | + $value[ 'font-backup' ], |
|
87 | 87 | ) |
88 | 88 | ); |
89 | 89 | } |
90 | - $property = ( isset( $output['choice'] ) && isset( $output['property'] ) ) ? $output['property'] : $property; |
|
91 | - $property_value = ( is_array( $property_value ) && isset( $property_value[0] ) ) ? $property_value[0] : $property_value; |
|
92 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $property ] = $output['prefix'] . $property_value . $output['suffix']; |
|
90 | + $property = ( isset( $output[ 'choice' ] ) && isset( $output[ 'property' ] ) ) ? $output[ 'property' ] : $property; |
|
91 | + $property_value = ( is_array( $property_value ) && isset( $property_value[ 0 ] ) ) ? $property_value[ 0 ] : $property_value; |
|
92 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $property ] = $output[ 'prefix' ] . $property_value . $output[ 'suffix' ]; |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | * @param array $value The field's value. |
23 | 23 | */ |
24 | 24 | protected function process_output( $output, $value ) { |
25 | - if ( ! isset( $output['element'] ) || ! isset( $output['property'] ) ) { |
|
25 | + if ( ! isset( $output[ 'element' ] ) || ! isset( $output[ 'property' ] ) ) { |
|
26 | 26 | return; |
27 | 27 | } |
28 | 28 | $output = wp_parse_args( |
@@ -34,16 +34,16 @@ discard block |
||
34 | 34 | ) |
35 | 35 | ); |
36 | 36 | if ( is_array( $value ) ) { |
37 | - if ( isset( $output['choice'] ) && $output['choice'] ) { |
|
38 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value[ $output['choice'] ] ) . $output['units'] . $output['suffix']; |
|
37 | + if ( isset( $output[ 'choice' ] ) && $output[ 'choice' ] ) { |
|
38 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value[ $output[ 'choice' ] ] ) . $output[ 'units' ] . $output[ 'suffix' ]; |
|
39 | 39 | return; |
40 | 40 | } |
41 | - if ( isset( $value['url'] ) ) { |
|
42 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value['url'] ) . $output['units'] . $output['suffix']; |
|
41 | + if ( isset( $value[ 'url' ] ) ) { |
|
42 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value[ 'url' ] ) . $output[ 'units' ] . $output[ 'suffix' ]; |
|
43 | 43 | return; |
44 | 44 | } |
45 | 45 | return; |
46 | 46 | } |
47 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $this->process_property_value( $output['property'], $value ) . $output['units'] . $output['suffix']; |
|
47 | + $this->styles[ $output[ 'media_query' ] ][ $output[ 'element' ] ][ $output[ 'property' ] ] = $output[ 'prefix' ] . $this->process_property_value( $output[ 'property' ], $value ) . $output[ 'units' ] . $output[ 'suffix' ]; |
|
48 | 48 | } |
49 | 49 | } |
@@ -52,15 +52,15 @@ discard block |
||
52 | 52 | protected function get_path( $context = '' ) { |
53 | 53 | $upload_dir = wp_upload_dir(); |
54 | 54 | $paths = array( |
55 | - 'file' => wp_normalize_path( $upload_dir['basedir'] . '/kirki-css/styles.css' ), |
|
56 | - 'folder' => wp_normalize_path( $upload_dir['basedir'] . '/kirki-css' ), |
|
55 | + 'file' => wp_normalize_path( $upload_dir[ 'basedir' ] . '/kirki-css/styles.css' ), |
|
56 | + 'folder' => wp_normalize_path( $upload_dir[ 'basedir' ] . '/kirki-css' ), |
|
57 | 57 | ); |
58 | 58 | |
59 | 59 | if ( 'file' === $context ) { |
60 | - return $paths['file']; |
|
60 | + return $paths[ 'file' ]; |
|
61 | 61 | } |
62 | 62 | if ( 'folder' === $context ) { |
63 | - return $paths['folder']; |
|
63 | + return $paths[ 'folder' ]; |
|
64 | 64 | } |
65 | 65 | return $paths; |
66 | 66 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function get_url() { |
76 | 76 | $upload_dir = wp_upload_dir(); |
77 | - return esc_url_raw( $upload_dir['baseurl'] . '/kirki-css/styles.css' ); |
|
77 | + return esc_url_raw( $upload_dir[ 'baseurl' ] . '/kirki-css/styles.css' ); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -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': |
@@ -52,15 +52,15 @@ |
||
52 | 52 | ) |
53 | 53 | ); |
54 | 54 | |
55 | - $array['title'] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) ); |
|
56 | - $array['content'] = $this->get_content(); |
|
57 | - $array['active'] = $this->active(); |
|
58 | - $array['instanceNumber'] = $this->instance_number; |
|
55 | + $array[ 'title' ] = html_entity_decode( $this->title, ENT_QUOTES, get_bloginfo( 'charset' ) ); |
|
56 | + $array[ 'content' ] = $this->get_content(); |
|
57 | + $array[ 'active' ] = $this->active(); |
|
58 | + $array[ 'instanceNumber' ] = $this->instance_number; |
|
59 | 59 | |
60 | - $array['customizeAction'] = esc_html__( 'Customizing', 'kirki' ); |
|
60 | + $array[ 'customizeAction' ] = esc_html__( 'Customizing', 'kirki' ); |
|
61 | 61 | if ( $this->panel ) { |
62 | 62 | /* translators: The title. */ |
63 | - $array['customizeAction'] = sprintf( esc_html__( 'Customizing ▸ %s', 'kirki' ), esc_html( $this->manager->get_panel( $this->panel )->title ) ); |
|
63 | + $array[ 'customizeAction' ] = sprintf( esc_html__( 'Customizing ▸ %s', 'kirki' ), esc_html( $this->manager->get_panel( $this->panel )->title ) ); |
|
64 | 64 | } |
65 | 65 | return $array; |
66 | 66 | } |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | */ |
66 | 66 | public function custom_css() { |
67 | 67 | $config = apply_filters( 'kirki_config', array() ); |
68 | - if ( ! isset( $config['color_accent'] ) && ! isset( $config['color_back'] ) ) { |
|
68 | + if ( ! isset( $config[ 'color_accent' ] ) && ! isset( $config[ 'color_back' ] ) ) { |
|
69 | 69 | return; |
70 | 70 | } |
71 | - $back = isset( $config['color_back'] ) ? $config['color_back'] : false; |
|
71 | + $back = isset( $config[ 'color_back' ] ) ? $config[ 'color_back' ] : false; |
|
72 | 72 | |
73 | 73 | $text_on_back = ''; |
74 | 74 | $border_on_back = ''; |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $hover_on_back = ( 90 < $back_obj->lightness ) ? $back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode ); |
91 | 91 | $arrows_on_back = ( 50 > $back_obj->lightness ) ? $back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode ); |
92 | 92 | } |
93 | - $accent = ( isset( $config['color_accent'] ) ) ? $config['color_accent'] : false; |
|
93 | + $accent = ( isset( $config[ 'color_accent' ] ) ) ? $config[ 'color_accent' ] : false; |
|
94 | 94 | if ( $accent ) { |
95 | 95 | $accent_obj = ariColor::newColor( $accent ); |
96 | 96 | $text_on_accent = ( 60 > $accent_obj->lightness ) ? $accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode ); |
@@ -402,18 +402,18 @@ discard block |
||
402 | 402 | color: #444 !important; |
403 | 403 | } |
404 | 404 | |
405 | - <?php if ( isset( $config['width'] ) ) : ?> |
|
405 | + <?php if ( isset( $config[ 'width' ] ) ) : ?> |
|
406 | 406 | .wp-full-overlay-sidebar { |
407 | - width: <?php echo esc_html( $config['width'] ); ?>; |
|
407 | + width: <?php echo esc_html( $config[ 'width' ] ); ?>; |
|
408 | 408 | } |
409 | 409 | .expanded .wp-full-overlay-footer { |
410 | - width: <?php echo esc_html( $config['width'] ); ?>; |
|
410 | + width: <?php echo esc_html( $config[ 'width' ] ); ?>; |
|
411 | 411 | } |
412 | 412 | .wp-full-overlay.expanded { |
413 | - margin-left: <?php echo esc_html( $config['width'] ); ?>; |
|
413 | + margin-left: <?php echo esc_html( $config[ 'width' ] ); ?>; |
|
414 | 414 | } |
415 | 415 | .wp-full-overlay.collapsed .wp-full-overlay-sidebar { |
416 | - margin-left: -<?php echo esc_html( $config['width'] ); ?>; |
|
416 | + margin-left: -<?php echo esc_html( $config[ 'width' ] ); ?>; |
|
417 | 417 | } |
418 | 418 | <?php endif; ?> |
419 | 419 | </style> |
@@ -75,13 +75,13 @@ |
||
75 | 75 | private function parse_fields() { |
76 | 76 | $fields = Kirki::$fields; |
77 | 77 | foreach ( $fields as $field ) { |
78 | - if ( isset( $field['tooltip'] ) && ! empty( $field['tooltip'] ) ) { |
|
78 | + if ( isset( $field[ 'tooltip' ] ) && ! empty( $field[ 'tooltip' ] ) ) { |
|
79 | 79 | // Get the control ID and properly format it for the tooltips. |
80 | - $id = str_replace( '[', '-', str_replace( ']', '', $field['settings'] ) ); |
|
80 | + $id = str_replace( '[', '-', str_replace( ']', '', $field[ 'settings' ] ) ); |
|
81 | 81 | // Add the tooltips content. |
82 | 82 | $this->tooltips_content[ $id ] = array( |
83 | 83 | 'id' => $id, |
84 | - 'content' => $field['tooltip'], |
|
84 | + 'content' => $field[ 'tooltip' ], |
|
85 | 85 | ); |
86 | 86 | } |
87 | 87 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | */ |
35 | 35 | public function to_json() { |
36 | 36 | parent::to_json(); |
37 | - $this->json['icons'] = Kirki_Helper::get_dashicons(); |
|
37 | + $this->json[ 'icons' ] = Kirki_Helper::get_dashicons(); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
@@ -83,28 +83,28 @@ discard block |
||
83 | 83 | |
84 | 84 | if ( empty( $this->button_label ) ) { |
85 | 85 | /* translators: %s represents the label of the row. */ |
86 | - $this->button_label = sprintf( esc_html__( 'Add new %s', 'kirki' ), $this->row_label['value'] ); |
|
86 | + $this->button_label = sprintf( esc_html__( 'Add new %s', 'kirki' ), $this->row_label[ 'value' ] ); |
|
87 | 87 | } |
88 | 88 | |
89 | - if ( empty( $args['fields'] ) || ! is_array( $args['fields'] ) ) { |
|
90 | - $args['fields'] = array(); |
|
89 | + if ( empty( $args[ 'fields' ] ) || ! is_array( $args[ 'fields' ] ) ) { |
|
90 | + $args[ 'fields' ] = array(); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | // An array to store keys of fields that need to be filtered. |
94 | 94 | $media_fields_to_filter = array(); |
95 | 95 | |
96 | - foreach ( $args['fields'] as $key => $value ) { |
|
97 | - if ( ! isset( $value['default'] ) ) { |
|
98 | - $args['fields'][ $key ]['default'] = ''; |
|
96 | + foreach ( $args[ 'fields' ] as $key => $value ) { |
|
97 | + if ( ! isset( $value[ 'default' ] ) ) { |
|
98 | + $args[ 'fields' ][ $key ][ 'default' ] = ''; |
|
99 | 99 | } |
100 | - if ( ! isset( $value['label'] ) ) { |
|
101 | - $args['fields'][ $key ]['label'] = ''; |
|
100 | + if ( ! isset( $value[ 'label' ] ) ) { |
|
101 | + $args[ 'fields' ][ $key ][ 'label' ] = ''; |
|
102 | 102 | } |
103 | - $args['fields'][ $key ]['id'] = $key; |
|
103 | + $args[ 'fields' ][ $key ][ 'id' ] = $key; |
|
104 | 104 | |
105 | 105 | // We check if the filed is an uploaded media ( image , file, video, etc.. ). |
106 | - if ( isset( $value['type'] ) ) { |
|
107 | - switch ( $value['type'] ) { |
|
106 | + if ( isset( $value[ 'type' ] ) ) { |
|
107 | + switch ( $value[ 'type' ] ) { |
|
108 | 108 | case 'image': |
109 | 109 | case 'cropped_image': |
110 | 110 | case 'upload': |
@@ -127,14 +127,14 @@ discard block |
||
127 | 127 | ); |
128 | 128 | |
129 | 129 | // Hackily add in the data link parameter. |
130 | - $dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args['fields'][ $key ]['id'] ) . '"' . $this->get_link(), $dropdown ); // phpcs:ignore Generic.Formatting.MultipleStatementAlignment.NotSameWarning |
|
131 | - $args['fields'][ $key ]['dropdown'] = $dropdown; |
|
130 | + $dropdown = str_replace( '<select', '<select data-field="' . esc_attr( $args[ 'fields' ][ $key ][ 'id' ] ) . '"' . $this->get_link(), $dropdown ); // phpcs:ignore Generic.Formatting.MultipleStatementAlignment.NotSameWarning |
|
131 | + $args[ 'fields' ][ $key ][ 'dropdown' ] = $dropdown; |
|
132 | 132 | break; |
133 | 133 | } |
134 | 134 | } |
135 | 135 | } |
136 | 136 | |
137 | - $this->fields = $args['fields']; |
|
137 | + $this->fields = $args[ 'fields' ]; |
|
138 | 138 | |
139 | 139 | // Now we are going to filter the fields. |
140 | 140 | // First we create a copy of the value that would be used otherwise. |
@@ -194,14 +194,14 @@ discard block |
||
194 | 194 | |
195 | 195 | $fields = $this->fields; |
196 | 196 | |
197 | - $this->json['fields'] = $fields; |
|
198 | - $this->json['row_label'] = $this->row_label; |
|
197 | + $this->json[ 'fields' ] = $fields; |
|
198 | + $this->json[ 'row_label' ] = $this->row_label; |
|
199 | 199 | |
200 | 200 | // If filtered_value has been set and is not empty we use it instead of the actual value. |
201 | 201 | if ( is_array( $this->filtered_value ) && ! empty( $this->filtered_value ) ) { |
202 | - $this->json['value'] = $this->filtered_value; |
|
202 | + $this->json[ 'value' ] = $this->filtered_value; |
|
203 | 203 | } |
204 | - $this->json['value'] = apply_filters( "kirki_controls_repeater_value_{$this->id}", $this->json['value'] ); |
|
204 | + $this->json[ 'value' ] = apply_filters( "kirki_controls_repeater_value_{$this->id}", $this->json[ 'value' ] ); |
|
205 | 205 | } |
206 | 206 | |
207 | 207 | /** |
@@ -224,9 +224,9 @@ discard block |
||
224 | 224 | |
225 | 225 | <ul class="repeater-fields"></ul> |
226 | 226 | |
227 | - <?php if ( isset( $this->choices['limit'] ) ) : ?> |
|
227 | + <?php if ( isset( $this->choices[ 'limit' ] ) ) : ?> |
|
228 | 228 | <?php /* translators: %s represents the number of rows we're limiting the repeater to allow. */ ?> |
229 | - <p class="limit"><?php printf( esc_html__( 'Limit: %s rows', 'kirki' ), esc_html( $this->choices['limit'] ) ); ?></p> |
|
229 | + <p class="limit"><?php printf( esc_html__( 'Limit: %s rows', 'kirki' ), esc_html( $this->choices[ 'limit' ] ) ); ?></p> |
|
230 | 230 | <?php endif; ?> |
231 | 231 | <button class="button-secondary repeater-add"><?php echo esc_html( $this->button_label ); ?></button> |
232 | 232 | |
@@ -459,24 +459,24 @@ discard block |
||
459 | 459 | protected function row_label( $args ) { |
460 | 460 | |
461 | 461 | // Validating args for row labels. |
462 | - if ( isset( $args['row_label'] ) && is_array( $args['row_label'] ) && ! empty( $args['row_label'] ) ) { |
|
462 | + if ( isset( $args[ 'row_label' ] ) && is_array( $args[ 'row_label' ] ) && ! empty( $args[ 'row_label' ] ) ) { |
|
463 | 463 | |
464 | 464 | // Validating row label type. |
465 | - if ( isset( $args['row_label']['type'] ) && ( 'text' === $args['row_label']['type'] || 'field' === $args['row_label']['type'] ) ) { |
|
466 | - $this->row_label['type'] = $args['row_label']['type']; |
|
465 | + if ( isset( $args[ 'row_label' ][ 'type' ] ) && ( 'text' === $args[ 'row_label' ][ 'type' ] || 'field' === $args[ 'row_label' ][ 'type' ] ) ) { |
|
466 | + $this->row_label[ 'type' ] = $args[ 'row_label' ][ 'type' ]; |
|
467 | 467 | } |
468 | 468 | |
469 | 469 | // Validating row label type. |
470 | - if ( isset( $args['row_label']['value'] ) && ! empty( $args['row_label']['value'] ) ) { |
|
471 | - $this->row_label['value'] = esc_html( $args['row_label']['value'] ); |
|
470 | + if ( isset( $args[ 'row_label' ][ 'value' ] ) && ! empty( $args[ 'row_label' ][ 'value' ] ) ) { |
|
471 | + $this->row_label[ 'value' ] = esc_html( $args[ 'row_label' ][ 'value' ] ); |
|
472 | 472 | } |
473 | 473 | |
474 | 474 | // Validating row label field. |
475 | - if ( isset( $args['row_label']['field'] ) && ! empty( $args['row_label']['field'] ) && isset( $args['fields'][ sanitize_key( $args['row_label']['field'] ) ] ) ) { |
|
476 | - $this->row_label['field'] = esc_html( $args['row_label']['field'] ); |
|
475 | + if ( isset( $args[ 'row_label' ][ 'field' ] ) && ! empty( $args[ 'row_label' ][ 'field' ] ) && isset( $args[ 'fields' ][ sanitize_key( $args[ 'row_label' ][ 'field' ] ) ] ) ) { |
|
476 | + $this->row_label[ 'field' ] = esc_html( $args[ 'row_label' ][ 'field' ] ); |
|
477 | 477 | } else { |
478 | 478 | // If from field is not set correctly, making sure standard is set as the type. |
479 | - $this->row_label['type'] = 'text'; |
|
479 | + $this->row_label[ 'type' ] = 'text'; |
|
480 | 480 | } |
481 | 481 | } |
482 | 482 | } |