Changeset 2009195

Timestamp:

01/09/2019 03:21:04 PM (7 years ago)

Author:

vlad.olaru

Message:

Fixed Gutenberg Editor fonts

Location:

customify/trunk

Files:

• class-pixcustomify.php (modified) (1 diff)
• customify.php (modified) (3 diffs)
• features/class-Font_Selector.php (modified) (4 diffs)
• includes/class-customify-gutenberg.php (modified) (1 diff)

customify/trunk/class-pixcustomify.php

@@ -938 +938 @@
             ob_start();
             ?>
-              if (typeof WebFont !== 'undefined') {<?php // if there is a WebFont object, use it ?>
-                WebFont.load({
-                  google: {families: [<?php echo( rtrim( $families, ',' ) ); ?>]},
-                  classes: false,
-                  events: false
-                });
-              } else {<?php // basically when we don't have the WebFont object we create the google script dynamically  ?>
-
-                var tk = document.createElement('script');
-                tk.src = '//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
-                tk.type = 'text/javascript';
-
-                tk.onload = tk.onreadystatechange = function () {
-                  WebFont.load({
-                    google: {families: [<?php echo( rtrim( $families, ',' ) ); ?>]},
-                    classes: false,
-                    events: false
-                  });
-                };
-
-                var s = document.getElementsByTagName('script')[0];
-                s.parentNode.insertBefore(tk, s);
-              }
-        <?php
+if (typeof WebFont !== 'undefined') {<?php // if there is a WebFont object, use it ?>
+    WebFont.load({
+        google: {families: [<?php echo( rtrim( $families, ',' ) ); ?>]},
+        classes: false,
+        events: false
+    });
+} else {<?php // basically when we don't have the WebFont object we create the google script dynamically  ?>
+
+    var tk = document.createElement('script');
+    tk.src = '//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
+    tk.type = 'text/javascript';
+
+    tk.onload = tk.onreadystatechange = function () {
+        WebFont.load({
+            google: {families: [<?php echo( rtrim( $families, ',' ) ); ?>]},
+            classes: false,
+            events: false
+        });
+    };
+
+    var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(tk, s);
+}<?php
             $output = ob_get_clean();
         }

customify/trunk/customify.php

@@ -4 +4 @@
 Plugin URI:  https://wordpress.org/plugins/customify/
 Description: A Theme Customizer Booster
-Version: 2.3.2
+Version: 2.3.3
 Author: Pixelgrade
 Author URI: https://pixelgrade.com
@@ -12 +12 @@
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
 Domain Path: /languages/
+Requires at least: 4.9
+Tested up to: 5.0.2
 */
 
@@ -62 +64 @@
     require_once plugin_dir_path( __FILE__ ) . 'class-pixcustomify.php';
 
-    $instance = PixCustomifyPlugin::instance( __FILE__, '2.3.2' );
+    $instance = PixCustomifyPlugin::instance( __FILE__, '2.3.3' );
 
     return $instance;

customify/trunk/features/class-Font_Selector.php

@@ -110 +110 @@
             if ( ! empty( $font ) ) {
                 //display the select option's HTML
-                Pix_Customize_Font_Control::output_font_option( $font['family'], $active_font_family, $font, 'theme_font' );
+                Pix_Customize_Font_Control::output_font_option( $font, $active_font_family, 'theme_font' );
             }
         }
@@ -177 +177 @@
                 }
 
-                if ( isset( $value['font_family'] ) && isset( $value['type'] ) && $value['type'] === 'google' ) {
+                if ( isset( $this->theme_fonts[ $value['font_family'] ] ) ) {
+
+//                  $value['type']     = 'theme_font';
+//                  $args['local_srcs'] .= $this->theme_fonts[ $value['font_family'] ]['src'] . ',';
+//                  $value['variants'] = $this->theme_fonts[ $value['font_family'] ]['variants'];
+
+                    if ( false === array_search( $value['font_family'], $args['local_families'] ) ) {
+                        $args['local_families'][] = "'" . $value['font_family'] . "'";
+                    }
+
+                    if ( false === array_search( $this->theme_fonts[ $value['font_family'] ]['src'], $args['local_srcs'] ) ) {
+                        $args['local_srcs'][] = "'" . $this->theme_fonts[ $value['font_family'] ]['src'] . "'";
+                    }
+                } elseif ( isset( $value['font_family'] ) && isset( $value['type'] ) && $value['type'] === 'google' ) {
                     $family = "'" . $value['font_family'];
 
@@ -213 +226 @@
 
                     $args['google_families'][] = $family;
-                } elseif ( isset( $this->theme_fonts[ $value['font_family'] ] ) ) {
-
-//                  $value['type']     = 'theme_font';
-//                  $args['local_srcs'] .= $this->theme_fonts[ $value['font_family'] ]['src'] . ',';
-//                  $value['variants'] = $this->theme_fonts[ $value['font_family'] ]['variants'];
-
-                    if ( false === array_search( $value['font_family'], $args['local_families'] ) ) {
-                        $args['local_families'][] = "'" . $value['font_family'] . "'";
-                    }
-
-                    if ( false === array_search( $this->theme_fonts[ $value['font_family'] ]['src'], $args['local_srcs'] ) ) {
-                        $args['local_srcs'][] = "'" . $this->theme_fonts[ $value['font_family'] ]['src'] . "'";
-                    }
                 }
             }
@@ -515 +515 @@
         }
 
-        ob_start();
-        ?>
-        var customify_font_loader = function () {
-        var webfontargs = {
-        classes: false,
-        events: false
-        };
-        <?php if ( ! empty( $args['google_families'] ) ) { ?>
-            webfontargs.google = {families: [<?php echo join( ',', $args['google_families'] ); ?>]};
-        <?php }
-        if ( ! empty( $args['local_families'] ) && ! empty( $args['local_srcs'] ) ) { ?>
-            webfontargs.custom = {
-            families: [<?php echo join( ',', $args['local_families'] ); ?>],
-            urls: [<?php echo join( ',', $args['local_srcs'] ) ?>]
-            };
-        <?php } ?>
-        WebFont.load(webfontargs);
-        };
-
-        if (typeof WebFont !== 'undefined') { <?php // if there is a WebFont object, use it ?>
-        customify_font_loader();
-        } else { <?php // basically when we don't have the WebFont object we create the google script dynamically  ?>
-        var tk = document.createElement('script');
-        tk.src = '//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
-        tk.type = 'text/javascript';
-
-        tk.onload = tk.onreadystatechange = function () {
-        customify_font_loader();
-        };
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(tk, s);
-        }
+        ob_start(); ?>
+function customify_font_loader() {
+    var webfontargs = {
+        classes: false,
+        events: false
+    };
+        <?php if ( ! empty( $args['google_families'] ) ) { ?>
+    webfontargs.google = {
+            families: [<?php echo join( ',', $args['google_families'] ); ?>]
+        };
+        <?php }
+        if ( ! empty( $args['local_families'] ) && ! empty( $args['local_srcs'] ) ) { ?>
+    webfontargs.custom = {
+            families: [<?php echo join( ',', $args['local_families'] ); ?>],
+            urls: [<?php echo join( ',', $args['local_srcs'] ) ?>]
+        };
+        <?php } ?>
+    WebFont.load(webfontargs);
+};
+
+if (typeof WebFont !== 'undefined') {
+    customify_font_loader();
+} else {
+    var tk = document.createElement('script');
+    tk.src = '//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
+    tk.type = 'text/javascript';
+
+    tk.onload = tk.onreadystatechange = function () {
+        customify_font_loader();
+    };
+
+    var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(tk, s);
+}
         <?php
         $output = ob_get_clean();

customify/trunk/includes/class-customify-gutenberg.php

@@ -218 +218 @@
         if ( PixCustomifyPlugin()->get_plugin_setting( 'enable_editor_style', true ) ) {
             add_filter( 'customify_typography_css_selector', array( $this, 'gutenbergify_font_css_selectors' ), 10, 2 );
-            wp_add_inline_script( $enqueue_parent_handle, PixCustomifyPlugin()->get_typography_dynamic_script() );
+            wp_add_inline_script( 'wp-editor', PixCustomifyPlugin()->get_typography_dynamic_script() );
             wp_add_inline_style( $enqueue_parent_handle, PixCustomifyPlugin()->get_typography_dynamic_style() );
             remove_filter( 'customify_typography_css_selector', array( $this, 'gutenbergify_font_css_selectors' ), 10 );
 
             add_filter( 'customify_font_css_selector', array( $this, 'gutenbergify_font_css_selectors' ), 10, 2 );
-            wp_add_inline_script( $enqueue_parent_handle, Customify_Font_Selector::instance()->get_fonts_dynamic_script() );
+            wp_add_inline_script( 'wp-editor', Customify_Font_Selector::instance()->get_fonts_dynamic_script() );
             wp_add_inline_style( $enqueue_parent_handle, Customify_Font_Selector::instance()->get_fonts_dynamic_style() );
             remove_filter( 'customify_font_css_selector', array( $this, 'gutenbergify_font_css_selectors' ), 10 );