Changeset 1835998

Timestamp:

03/08/2018 07:32:39 AM (8 years ago)

Author:

tyohan

Message:

update with combine assets

Location:

mcw-pwa/trunk

Files:

• MCW_PWA.php (modified) (4 diffs)
• includes/MCW_PWA_Assets.php (modified) (2 diffs)
• includes/MCW_PWA_Module.php (modified) (2 diffs)
• includes/MCW_PWA_Service_Worker.php (modified) (1 diff)
• includes/MCW_PWA_Settings.php (modified) (2 diffs)
• php.ini (added)

mcw-pwa/trunk/MCW_PWA.php

@@ -4 +4 @@
 Plugin URI:   https://github.com/tyohan/mcw-pwa
 Description:  WordPress plugin to optimize loading performance with minimum configuration using PWA approach
-Version:      0.1.1
+Version:      0.1.2
 Author:       Yohan Totting
 Author URI:   https://tyohan.me
@@ -36 +36 @@
 
 require_once(MCW_PWA_DIR.'/includes/MCW_PWA_Service_Worker.php');
+require_once(MCW_PWA_DIR.'/includes/performance/MCW_PWA_Performance.php');
 require_once(MCW_PWA_DIR.'/includes/MCW_PWA_Settings.php');
 require_once(MCW_PWA_DIR.'/includes/MCW_PWA_LazyLoad.php');
 require_once(MCW_PWA_DIR.'includes/MCW_PWA_Assets.php');
-    
+require_once(MCW_PWA_DIR.'includes/MCW_PWA_Add_Homescreen.php');
 
 MCW_PWA_Settings::instance();
@@ -45 +46 @@
 MCW_PWA_LazyLoad::instance();
 MCW_PWA_Assets::instance();
+//MCW_PWA_Add_Homescreen::instance();
+MCW_PWA_Performance::instance();
 
 register_deactivation_hook( __FILE__, array(MCW_PWA_Service_Worker::instance(),'flushRewriteRules' ));
@@ -53 +56 @@
     delete_option('mcw_enable_service_workers');
     delete_option('mcw_enable_lazy_load');
+    delete_option('mcw_enable_performance');
 }
 

mcw-pwa/trunk/includes/MCW_PWA_Assets.php

@@ -29 +29 @@
             add_filter( 'style_loader_src', array($this,'removeVersion'), 9999,1 );
             // Remove WP Version From Scripts
-            add_filter( 'script_loader_src', array($this,'removeVersion'), 9999,1 );
+            add_filter( 'script_loader_src', array($this,'removeVersion'), 9999,1 );
+            
+            $this->disableEmojis();
         }
     }
@@ -93 +95 @@
         return $tag;
     }
+
+    public function disableEmojis() {
+        remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
+        remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
+        remove_action( 'embed_head', 'print_emoji_detection_script', 7 );
+
+        remove_action( 'wp_print_styles', 'print_emoji_styles' );
+        remove_action( 'admin_print_styles', 'print_emoji_styles' );
+
+        remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
+        remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
+        remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
+
+        add_filter( 'tiny_mce_plugins', array( $this, 'disableEmojiTinymce' ) );
+        add_filter( 'wp_resource_hints', array( $this, 'disableEmojisRemoveDNSPrefetch' ), 10, 2 );
+    }
+    
+    /**
+     * Filter function used to remove the tinymce emoji plugin.
+     *
+     * @param array $plugins
+     * @return array Difference betwen the two arrays
+     */
+    public function disableEmojiTinymce( $plugins ) {
+        if ( is_array( $plugins ) ) {
+            return array_diff( $plugins, array( 'wpemoji' ) );
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * Remove emoji CDN hostname from DNS prefetching hints.
+     *
+     * @param array $urls URLs to print for resource hints.
+     * @param string $relation_type The relation type the URLs are printed for.
+     * @return array Difference betwen the two arrays.
+     */
+    public function disableEmojisRemoveDNSPrefetch( $urls, $relation_type ) {
+        if ( 'dns-prefetch' == $relation_type ) {
+            /** This filter is documented in wp-includes/formatting.php */
+            $emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2/svg/' );
+
+            $urls = array_diff( $urls, array( $emoji_svg_url ) );
+        }
+
+        return $urls;
+    }
 }

mcw-pwa/trunk/includes/MCW_PWA_Module.php

@@ -18 +18 @@
     }
 
+    protected function settingsApiInit(){
+
+    }
+    
+    protected function initScript(){
+        //won't do anything unless overide 
+
+    }
+
     public function settingCallback() {
         
@@ -31 +40 @@
         return (int) get_option( $this->getKey(), 1 )===1;
     }
+
+    public static function debug($msg){
+        echo '<script>console.log('.$msg.');</script>';
+    }
 }

mcw-pwa/trunk/includes/MCW_PWA_Service_Worker.php

@@ -20 +20 @@
         parent::__construct();
         if($this->isEnable()){
-            add_action( 'init', array( self::$__instance, 'registerRewriteRule' ) );
+            add_action( 'init', array( $this, 'registerRewriteRule' ) );
             add_action( 'template_redirect', array( $this, 'renderSW' ), 2 );
             add_filter( 'query_vars', array( $this, 'registerQueryVar' ) );

mcw-pwa/trunk/includes/MCW_PWA_Settings.php

@@ -1 +1 @@
 <?php
+define( 'MCW_SETTING_URL', 'mcw_setting_page' );
 require_once(MCW_PWA_DIR.'/includes/MCW_PWA_Service_Worker.php');
 require_once(MCW_PWA_DIR.'/includes/MCW_PWA_LazyLoad.php');
@@ -75 +76 @@
             
         }
+        
+        if( isset( $_GET[ 'tab' ] ) ) {
+            $active_tab = $_GET[ 'tab' ];
+        } // end if
         ?>
         <div class="wrap">
             <h1>Minimum Configuration WordPress PWA Settings</h1>
+            
             <?php 
                 // show error/update messages
                 settings_errors( 'mcw_messages' );
             ?>
+            <h2 class="nav-tab-wrapper">
+                <?php  echo '<a href="?page='.MCW_SETTING_URL.'&tab=enable_options" class="nav-tab '.($active_tab == "enable_options" ? "nav-tab-active" : "").'">Enable Features</a>';?>
+                <?php  echo '<a href="?page='.MCW_SETTING_URL.'&tab=manifest_options" class="nav-tab '.($active_tab == "manifest_options" ? "nav-tab-active" : "").'">Web Manifest</a>';?>
+            </h2>
+
             <form method="post" action="options.php">
             <?php
-                // This prints out all hidden setting fields
-                settings_fields( MCW_PWA_OPTION);
-                do_settings_sections( MCW_PWA_SETTING_PAGE );
+                if( $active_tab == 'enable_options' ) {
+                    // This prints out all hidden setting fields
+                    settings_fields( MCW_PWA_OPTION);
+                    do_settings_sections( MCW_PWA_SETTING_PAGE );
+                } else {
+                    // This print out manifest settings
+                    
+                } // end if/else
+                
                 submit_button();
             ?>