← All changes
|
Libs/adminify-framework/fields/typography/typography.php
+12
-13
4.2.6
→
4.0.5.4
View file →
| @@ -19,9 +19,9 @@ | ||
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | public function render() { |
| 22 | 22 | |
| 23 | - echo wp_kses_post( $this->field_before() ); | |
| 23 | + echo $this->field_before(); | |
| 24 | 24 | |
| 25 | 25 | $args = wp_parse_args( $this->field, array( |
| 26 | 26 | 'font_family' => true, |
| 27 | 27 | 'font_weight' => true, |
| @@ -93,9 +93,9 @@ | ||
| 93 | 93 | // Font Family |
| 94 | 94 | if ( ! empty( $args['font_family'] ) ) { |
| 95 | 95 | echo '<div class="adminify--block">'; |
| 96 | 96 | echo '<div class="adminify--title">'. esc_html__( 'Font Family', 'adminify' ) .'</div>'; |
| 97 | - echo $this->create_select( array( $this->value['font-family'] => $this->value['font-family'] ), 'font-family', esc_html__( 'Select a font', 'adminify' ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- returns markup escaped within the method. | |
| 97 | + echo $this->create_select( array( $this->value['font-family'] => $this->value['font-family'] ), 'font-family', esc_html__( 'Select a font', 'adminify' ) ); | |
| 98 | 98 | echo '</div>'; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | // |
| @@ -102,9 +102,9 @@ | ||
| 102 | 102 | // Backup Font Family |
| 103 | 103 | if ( ! empty( $args['backup_font_family'] ) ) { |
| 104 | 104 | echo '<div class="adminify--block adminify--block-backup-font-family hidden">'; |
| 105 | 105 | echo '<div class="adminify--title">'. esc_html__( 'Backup Font Family', 'adminify' ) .'</div>'; |
| 106 | - echo $this->create_select( apply_filters( 'adminify_field_typography_backup_font_family', array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- returns markup escaped within the method. | |
| 106 | + echo $this->create_select( apply_filters( 'adminify_field_typography_backup_font_family', array( | |
| 107 | 107 | 'Arial, Helvetica, sans-serif', |
| 108 | 108 | "'Arial Black', Gadget, sans-serif", |
| 109 | 109 | "'Comic Sans MS', cursive, sans-serif", |
| 110 | 110 | 'Impact, Charcoal, sans-serif', |
| @@ -142,9 +142,9 @@ | ||
| 142 | 142 | if ( ! empty( $args['extra_styles'] ) ) { |
| 143 | 143 | echo '<div class="adminify--block-extra-styles hidden">'; |
| 144 | 144 | echo ( ! $this->chosen ) ? '<div class="adminify--title">'. esc_html__( 'Load Extra Styles', 'adminify' ) .'</div>' : ''; |
| 145 | 145 | $placeholder = ( $this->chosen ) ? esc_html__( 'Load Extra Styles', 'adminify' ) : esc_html__( 'Default', 'adminify' ); |
| 146 | - echo $this->create_select( $this->value['extra-styles'], 'extra-styles', $placeholder, true ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- returns markup escaped within the method. | |
| 146 | + echo $this->create_select( $this->value['extra-styles'], 'extra-styles', $placeholder, true ); | |
| 147 | 147 | echo '</div>'; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | echo '</div>'; |
| @@ -156,9 +156,9 @@ | ||
| 156 | 156 | if ( ! empty( $args['subset'] ) ) { |
| 157 | 157 | echo '<div class="adminify--block adminify--block-subset hidden">'; |
| 158 | 158 | echo '<div class="adminify--title">'. esc_html__( 'Subset', 'adminify' ) .'</div>'; |
| 159 | 159 | $subset = ( is_array( $this->value['subset'] ) ) ? $this->value['subset'] : array_filter( (array) $this->value['subset'] ); |
| 160 | - echo $this->create_select( $subset, 'subset', esc_html__( 'Default', 'adminify' ), $args['multi_subset'] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- returns markup escaped within the method. | |
| 160 | + echo $this->create_select( $subset, 'subset', esc_html__( 'Default', 'adminify' ), $args['multi_subset'] ); | |
| 161 | 161 | echo '</div>'; |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | // |
| @@ -165,9 +165,9 @@ | ||
| 165 | 165 | // Text Align |
| 166 | 166 | if ( ! empty( $args['text_align'] ) ) { |
| 167 | 167 | echo '<div class="adminify--block">'; |
| 168 | 168 | echo '<div class="adminify--title">'. esc_html__( 'Text Align', 'adminify' ) .'</div>'; |
| 169 | - echo $this->create_select( array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- returns markup escaped within the method. | |
| 169 | + echo $this->create_select( array( | |
| 170 | 170 | 'inherit' => esc_html__( 'Inherit', 'adminify' ), |
| 171 | 171 | 'left' => esc_html__( 'Left', 'adminify' ), |
| 172 | 172 | 'center' => esc_html__( 'Center', 'adminify' ), |
| 173 | 173 | 'right' => esc_html__( 'Right', 'adminify' ), |
| @@ -181,9 +181,9 @@ | ||
| 181 | 181 | // Font Variant |
| 182 | 182 | if ( ! empty( $args['font_variant'] ) ) { |
| 183 | 183 | echo '<div class="adminify--block">'; |
| 184 | 184 | echo '<div class="adminify--title">'. esc_html__( 'Font Variant', 'adminify' ) .'</div>'; |
| 185 | - echo $this->create_select( array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- returns markup escaped within the method. | |
| 185 | + echo $this->create_select( array( | |
| 186 | 186 | 'normal' => esc_html__( 'Normal', 'adminify' ), |
| 187 | 187 | 'small-caps' => esc_html__( 'Small Caps', 'adminify' ), |
| 188 | 188 | 'all-small-caps' => esc_html__( 'All Small Caps', 'adminify' ) |
| 189 | 189 | ), 'font-variant', esc_html__( 'Default', 'adminify' ) ); |
| @@ -194,9 +194,9 @@ | ||
| 194 | 194 | // Text Transform |
| 195 | 195 | if ( ! empty( $args['text_transform'] ) ) { |
| 196 | 196 | echo '<div class="adminify--block">'; |
| 197 | 197 | echo '<div class="adminify--title">'. esc_html__( 'Text Transform', 'adminify' ) .'</div>'; |
| 198 | - echo $this->create_select( array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- returns markup escaped within the method. | |
| 198 | + echo $this->create_select( array( | |
| 199 | 199 | 'none' => esc_html__( 'None', 'adminify' ), |
| 200 | 200 | 'capitalize' => esc_html__( 'Capitalize', 'adminify' ), |
| 201 | 201 | 'uppercase' => esc_html__( 'Uppercase', 'adminify' ), |
| 202 | 202 | 'lowercase' => esc_html__( 'Lowercase', 'adminify' ) |
| @@ -208,9 +208,9 @@ | ||
| 208 | 208 | // Text Decoration |
| 209 | 209 | if ( ! empty( $args['text_decoration'] ) ) { |
| 210 | 210 | echo '<div class="adminify--block">'; |
| 211 | 211 | echo '<div class="adminify--title">'. esc_html__( 'Text Decoration', 'adminify' ) .'</div>'; |
| 212 | - echo $this->create_select( array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- returns markup escaped within the method. | |
| 212 | + echo $this->create_select( array( | |
| 213 | 213 | 'none' => esc_html__( 'None', 'adminify' ), |
| 214 | 214 | 'underline' => esc_html__( 'Solid', 'adminify' ), |
| 215 | 215 | 'underline double' => esc_html__( 'Double', 'adminify' ), |
| 216 | 216 | 'underline dotted' => esc_html__( 'Dotted', 'adminify' ), |
| @@ -282,9 +282,9 @@ | ||
| 282 | 282 | $default_color_attr = ( ! empty( $default_value['color'] ) ) ? ' data-default-color="'. esc_attr( $default_value['color'] ) .'"' : ''; |
| 283 | 283 | echo '<div class="adminify--block adminify--block-font-color">'; |
| 284 | 284 | echo '<div class="adminify--title">'. esc_html__( 'Font Color', 'adminify' ) .'</div>'; |
| 285 | 285 | echo '<div class="adminify-field-color">'; |
| 286 | - echo '<input type="text" name="'. esc_attr( $this->field_name( '[color]' ) ) .'" class="adminify-color adminify--color" value="'. esc_attr( $this->value['color'] ) .'"'. $default_color_attr .' />'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- attribute value pre-escaped with esc_attr() where built. | |
| 286 | + echo '<input type="text" name="'. esc_attr( $this->field_name( '[color]' ) ) .'" class="adminify-color adminify--color" value="'. esc_attr( $this->value['color'] ) .'"'. $default_color_attr .' />'; | |
| 287 | 287 | echo '</div>'; |
| 288 | 288 | echo '</div>'; |
| 289 | 289 | } |
| 290 | 290 | |
| @@ -312,9 +312,9 @@ | ||
| 312 | 312 | echo '<input type="hidden" name="'. esc_attr( $this->field_name( '[unit]' ) ) .'" class="adminify--unit-save" value="'. esc_attr( $args['unit'] ) .'" />'; |
| 313 | 313 | |
| 314 | 314 | echo '</div>'; |
| 315 | 315 | |
| 316 | - echo wp_kses_post( $this->field_after() ); | |
| 316 | + echo $this->field_after(); | |
| 317 | 317 | |
| 318 | 318 | } |
| 319 | 319 | |
| 320 | 320 | public function create_select( $options, $name, $placeholder = '', $is_multiple = false ) { |
| @@ -350,10 +350,9 @@ | ||
| 350 | 350 | if ( ! wp_script_is( 'adminify-webfontloader' ) ) { |
| 351 | 351 | |
| 352 | 352 | ADMINIFY::include_plugin_file( 'fields/typography/google-fonts.php' ); |
| 353 | 353 | |
| 354 | - $webfontloader_url = defined( 'PXLBSADMINIFY_ASSETS' ) ? PXLBSADMINIFY_ASSETS . 'vendors/webfontloader/webfontloader.min.js' : ''; | |
| 355 | - wp_enqueue_script( 'adminify-webfontloader', $webfontloader_url, array( 'adminify' ), '1.6.28', true ); | |
| 354 | + wp_enqueue_script( 'adminify-webfontloader', 'https://cdn.jsdelivr.net/npm/webfontloader@1.6.28/webfontloader.min.js', array( 'adminify' ), '1.6.28', true ); | |
| 356 | 355 | |
| 357 | 356 | $webfonts = array(); |
| 358 | 357 | |
| 359 | 358 | $customwebfonts = apply_filters( 'adminify_field_typography_customwebfonts', array() ); |