aristath /
kirki
@@ -49,13 +49,13 @@ discard block |
||
| 49 | 49 | protected function set_default() { |
| 50 | 50 | |
| 51 | 51 | // Accomodate the use of font-weight and convert to variant. |
| 52 | - if ( isset( $this->default['font-weight'] ) ) { |
|
| 53 | - $this->default['variant'] = ( 'regular' === $this->default['font-weight'] ) ? 400 : (string) intval( $this->default['font-weight'] ); |
|
| 52 | + if ( isset( $this->default[ 'font-weight' ] ) ) { |
|
| 53 | + $this->default[ 'variant' ] = ( 'regular' === $this->default[ 'font-weight' ] ) ? 400 : (string) intval( $this->default[ 'font-weight' ] ); |
|
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // Make sure letter-spacing has units. |
| 57 | - if ( isset( $this->default['letter-spacing'] ) && is_numeric( $this->default['letter-spacing'] ) && $this->default['letter-spacing'] ) { |
|
| 58 | - $this->default['letter-spacing'] .= 'px'; |
|
| 57 | + if ( isset( $this->default[ 'letter-spacing' ] ) && is_numeric( $this->default[ 'letter-spacing' ] ) && $this->default[ 'letter-spacing' ] ) { |
|
| 58 | + $this->default[ 'letter-spacing' ] .= 'px'; |
|
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | |
@@ -106,15 +106,15 @@ discard block |
||
| 106 | 106 | foreach ( $this->output as $output ) { |
| 107 | 107 | |
| 108 | 108 | // If 'element' or 'property' are not defined, skip this. |
| 109 | - if ( ! isset( $output['element'] ) ) { |
|
| 109 | + if ( ! isset( $output[ 'element' ] ) ) { |
|
| 110 | 110 | continue; |
| 111 | 111 | } |
| 112 | - if ( is_array( $output['element'] ) ) { |
|
| 113 | - $output['element'] = implode( ',', $output['element'] ); |
|
| 112 | + if ( is_array( $output[ 'element' ] ) ) { |
|
| 113 | + $output[ 'element' ] = implode( ',', $output[ 'element' ] ); |
|
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | // If we got this far, it's safe to add this. |
| 117 | - $js_vars[] = $output; |
|
| 117 | + $js_vars[ ] = $output; |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | // Did we manage to get all the items from 'output'? |
@@ -146,26 +146,26 @@ discard block |
||
| 146 | 146 | foreach ( $value as $key => $val ) { |
| 147 | 147 | switch ( $key ) { |
| 148 | 148 | case 'font-family': |
| 149 | - $value['font-family'] = esc_attr( $val ); |
|
| 149 | + $value[ 'font-family' ] = esc_attr( $val ); |
|
| 150 | 150 | break; |
| 151 | 151 | case 'font-weight': |
| 152 | - if ( isset( $value['variant'] ) ) { |
|
| 152 | + if ( isset( $value[ 'variant' ] ) ) { |
|
| 153 | 153 | break; |
| 154 | 154 | } |
| 155 | - $value['variant'] = $val; |
|
| 156 | - if ( isset( $value['font-style'] ) && 'italic' === $value['font-style'] ) { |
|
| 157 | - $value['variant'] = ( '400' !== $val || 400 !== $val ) ? $value['variant'] . 'italic' : 'italic'; |
|
| 155 | + $value[ 'variant' ] = $val; |
|
| 156 | + if ( isset( $value[ 'font-style' ] ) && 'italic' === $value[ 'font-style' ] ) { |
|
| 157 | + $value[ 'variant' ] = ( '400' !== $val || 400 !== $val ) ? $value[ 'variant' ] . 'italic' : 'italic'; |
|
| 158 | 158 | } |
| 159 | 159 | break; |
| 160 | 160 | case 'variant': |
| 161 | 161 | // Use 'regular' instead of 400 for font-variant. |
| 162 | - $value['variant'] = ( 400 === $val || '400' === $val ) ? 'regular' : $val; |
|
| 162 | + $value[ 'variant' ] = ( 400 === $val || '400' === $val ) ? 'regular' : $val; |
|
| 163 | 163 | // Get font-weight from variant. |
| 164 | - $value['font-weight'] = filter_var( $value['variant'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ); |
|
| 165 | - $value['font-weight'] = ( 'regular' === $value['variant'] || 'italic' === $value['variant'] ) ? 400 : absint( $value['font-weight'] ); |
|
| 164 | + $value[ 'font-weight' ] = filter_var( $value[ 'variant' ], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION ); |
|
| 165 | + $value[ 'font-weight' ] = ( 'regular' === $value[ 'variant' ] || 'italic' === $value[ 'variant' ] ) ? 400 : absint( $value[ 'font-weight' ] ); |
|
| 166 | 166 | // Get font-style from variant. |
| 167 | - if ( ! isset( $value['font-style'] ) ) { |
|
| 168 | - $value['font-style'] = ( false === strpos( $value['variant'], 'italic' ) ) ? 'normal' : 'italic'; |
|
| 167 | + if ( ! isset( $value[ 'font-style' ] ) ) { |
|
| 168 | + $value[ 'font-style' ] = ( false === strpos( $value[ 'variant' ], 'italic' ) ) ? 'normal' : 'italic'; |
|
| 169 | 169 | } |
| 170 | 170 | break; |
| 171 | 171 | case 'font-size': |
@@ -176,21 +176,21 @@ discard block |
||
| 176 | 176 | break; |
| 177 | 177 | case 'text-align': |
| 178 | 178 | if ( ! in_array( $val, array( '', 'inherit', 'left', 'center', 'right', 'justify' ), true ) ) { |
| 179 | - $value['text-align'] = ''; |
|
| 179 | + $value[ 'text-align' ] = ''; |
|
| 180 | 180 | } |
| 181 | 181 | break; |
| 182 | 182 | case 'text-transform': |
| 183 | 183 | if ( ! in_array( $val, array( '', 'none', 'capitalize', 'uppercase', 'lowercase', 'initial', 'inherit' ), true ) ) { |
| 184 | - $value['text-transform'] = ''; |
|
| 184 | + $value[ 'text-transform' ] = ''; |
|
| 185 | 185 | } |
| 186 | 186 | break; |
| 187 | 187 | case 'text-decoration': |
| 188 | - if ( ! in_array( $val, array( ''. 'none', 'underline', 'overline', 'line-through', 'initial', 'inherit' ), true ) ) { |
|
| 189 | - $value['text-transform'] = ''; |
|
| 188 | + if ( ! in_array( $val, array( '' . 'none', 'underline', 'overline', 'line-through', 'initial', 'inherit' ), true ) ) { |
|
| 189 | + $value[ 'text-transform' ] = ''; |
|
| 190 | 190 | } |
| 191 | 191 | break; |
| 192 | 192 | case 'color': |
| 193 | - $value['color'] = '' === $value['color'] ? '' : ariColor::newColor( $val )->toCSS( 'hex' ); |
|
| 193 | + $value[ 'color' ] = '' === $value[ 'color' ] ? '' : ariColor::newColor( $val )->toCSS( 'hex' ); |
|
| 194 | 194 | break; |
| 195 | 195 | } // End switch(). |
| 196 | 196 | } // End foreach(). |
