From 3c817edc3fb82450bac337665eb7d846c1709cb8 Mon Sep 17 00:00:00 2001 From: Joshua Reynolds Date: Wed, 18 Aug 2021 13:18:46 -0500 Subject: [PATCH 1/4] Fix excluded delayed JS so still loads --- src/optimize.cls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/optimize.cls.php b/src/optimize.cls.php index b2210f43f..bfca39acb 100644 --- a/src/optimize.cls.php +++ b/src/optimize.cls.php @@ -462,7 +462,7 @@ private function _optimize() { */ private function _build_js_tag( $src ) { if ( $this->cfg_js_defer === 2 ) { - return ''; + return ''; } if ( $this->cfg_js_defer ) { From 23e4fbc343b322175ad3c5f1af96cf0a661b3367 Mon Sep 17 00:00:00 2001 From: Joshua Reynolds Date: Wed, 18 Aug 2021 17:27:16 -0500 Subject: [PATCH 2/4] Typos in console & debug msgs --- assets/js/js_delay.min.js | 2 +- assets/js/lazyload.min.js | 2 +- src/img-optm.cls.php | 4 ++-- src/import.cls.php | 2 +- src/media.cls.php | 2 +- src/optimize.cls.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/js/js_delay.min.js b/assets/js/js_delay.min.js index b48bae9e2..9260cf759 100644 --- a/assets/js/js_delay.min.js +++ b/assets/js/js_delay.min.js @@ -1 +1 @@ -const litespeed_ui_events=["mouseover","click","keydown","wheel","touchmove","touchstart"];var litespeed_delay_i=0,urlCreator=window.URL||window.webkitURL;function litespeed_load_delayed_js_forced(){console.log("start delay load js"),litespeed_ui_events.forEach(function(e){window.removeEventListener(e,litespeed_load_delayed_js_forced,{passive:!0})}),litespeed_load_delayed_js(!0),document.querySelectorAll("iframe[data-litespeed-src]").forEach(function(e){e.setAttribute("src",e.getAttribute("data-litespeed-src"))})}function litespeed_load_delayed_js(e){e&&console.log("Force runing delay JS"),litespeed_load_one()}function litespeed_inline2src(t){try{var a=urlCreator.createObjectURL(new Blob([t.replace(/^(?:)?$/gm,"$1")],{type:"text/javascript"}))}catch(e){a="data:text/javascript;base64,"+btoa(t.replace(/^(?:)?$/gm,"$1"))}return a}function litespeed_load_one(){litespeed_delay_i++;var t,a=document.querySelector('script[type="litespeed/javascript"][data-i="'+litespeed_delay_i+'"]');a?(console.log("load i="+a.getAttribute("data-i"),"-----",a),(t=document.createElement("script")).addEventListener("load",function(){console.log("loaded --- "+t.getAttribute("data-i")),litespeed_load_one()},{passive:!0}),a.getAttributeNames().forEach(function(e){"type"!=e&&t.setAttribute("data-src"==e?"src":e,a.getAttribute(e))}),t.type="text/javascript",!t.src&&a.textContent&&(t.src=litespeed_inline2src(a.textContent)),a.after(t),a.remove()):console.log("all loaded!")}litespeed_ui_events.forEach(function(e){window.addEventListener(e,litespeed_load_delayed_js_forced,{passive:!0})}); \ No newline at end of file +const litespeed_ui_events=["mouseover","click","keydown","wheel","touchmove","touchstart"];var litespeed_delay_i=0,urlCreator=window.URL||window.webkitURL;function litespeed_load_delayed_js_forced(){console.log("Start Load JS Delayed"),litespeed_ui_events.forEach(function(e){window.removeEventListener(e,litespeed_load_delayed_js_forced,{passive:!0})}),litespeed_load_delayed_js(!0),document.querySelectorAll("iframe[data-litespeed-src]").forEach(function(e){e.setAttribute("src",e.getAttribute("data-litespeed-src"))})}function litespeed_load_delayed_js(e){e&&console.log("Force running delayed JS"),litespeed_load_one()}function litespeed_inline2src(t){try{var a=urlCreator.createObjectURL(new Blob([t.replace(/^(?:)?$/gm,"$1")],{type:"text/javascript"}))}catch(e){a="data:text/javascript;base64,"+btoa(t.replace(/^(?:)?$/gm,"$1"))}return a}function litespeed_load_one(){litespeed_delay_i++;var t,a=document.querySelector('script[type="litespeed/javascript"][data-i="'+litespeed_delay_i+'"]');a?(console.log("load i="+a.getAttribute("data-i"),"-----",a),(t=document.createElement("script")).addEventListener("load",function(){console.log("loaded --- "+t.getAttribute("data-i")),litespeed_load_one()},{passive:!0}),a.getAttributeNames().forEach(function(e){"type"!=e&&t.setAttribute("data-src"==e?"src":e,a.getAttribute(e))}),t.type="text/javascript",!t.src&&a.textContent&&(t.src=litespeed_inline2src(a.textContent)),a.after(t),a.remove()):console.log("All loaded!")}litespeed_ui_events.forEach(function(e){window.addEventListener(e,litespeed_load_delayed_js_forced,{passive:!0})}); \ No newline at end of file diff --git a/assets/js/lazyload.min.js b/assets/js/lazyload.min.js index cbb75cdfd..12b025c8d 100644 --- a/assets/js/lazyload.min.js +++ b/assets/js/lazyload.min.js @@ -1 +1 @@ -var _extends=Object.assign||function(t){for(var e=1;eget_results( $wpdb->prepare( $q, $offset * $limit, $limit + 1 ) ); // last one is the seed for next batch if ( ! $list ) { - $msg = __( 'Rescaned successfully.', 'litespeed-cache' ); + $msg = __( 'Rescanned successfully.', 'litespeed-cache' ); Admin_Display::succeed( $msg ); Debug2::debug( '[Img_Optm] rescan bypass: no gathered image found' ); diff --git a/src/import.cls.php b/src/import.cls.php index 5bc30472c..ed8cc1a95 100644 --- a/src/import.cls.php +++ b/src/import.cls.php @@ -70,7 +70,7 @@ public function export( $only_data_return = false ) { public function import( $file = false ) { if ( ! $file ) { if ( empty( $_FILES[ 'ls_file' ][ 'name' ] ) || substr( $_FILES[ 'ls_file' ][ 'name' ], -5 ) != '.data' || empty( $_FILES[ 'ls_file' ][ 'tmp_name' ] ) ) { - Debug2::debug( 'Import: Failed to import, wront ls_file' ); + Debug2::debug( 'Import: Failed to import, wrong ls_file' ); $msg = __( 'Import failed due to file error.', 'litespeed-cache' ); Admin_Display::error( $msg ); diff --git a/src/media.cls.php b/src/media.cls.php index 54a94bbaa..a0dd737c1 100644 --- a/src/media.cls.php +++ b/src/media.cls.php @@ -810,7 +810,7 @@ private function _replace_buffer_img_webp( $content ) { * @since 4.0 */ public function replace_background_webp( $content ) { - Debug2::debug2( '[Media] Start replacing bakcground WebP.' ); + Debug2::debug2( '[Media] Start replacing background WebP.' ); // preg_match_all( '#background-image:(\s*)url\((.*)\)#iU', $content, $matches ); preg_match_all( '#url\(([^)]+)\)#iU', $content, $matches ); diff --git a/src/optimize.cls.php b/src/optimize.cls.php index bfca39acb..f7879d483 100644 --- a/src/optimize.cls.php +++ b/src/optimize.cls.php @@ -379,7 +379,7 @@ private function _optimize() { // Shouldn't give any optm (defer/delay) @since 4.4 if ( $this->_var_preserve_js ) { $this->html_head .= ''; - Debug2::debug2( '[Optm] Inline JS defer vars', $this->_var_preserve_js ); + Debug2::debug2( '[Optm] Inline JS vars', $this->_var_preserve_js ); } // Append async compatibility lib to head From f4d0c186b69bc91cafe854ab959fd9ace50a279d Mon Sep 17 00:00:00 2001 From: Joshua Reynolds Date: Wed, 18 Aug 2021 17:33:29 -0500 Subject: [PATCH 3/4] Added modern GA & GTM default exclusion --- data/const.default.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/const.default.ini b/data/const.default.ini index b9bea32a6..cb6413330 100644 --- a/data/const.default.ini +++ b/data/const.default.ini @@ -374,7 +374,8 @@ optm-ccss_sep_uri = '' optm-js_defer_exc = 'jquery.js jquery.min.js gtm.js -analytics.js' +analytics.js +/gtag/js' ; O_OPTM_GM_JS_EXC optm-gm_js_exc = '' From b2de105f4c87a5a295ad9f8f8eb5fa687f50108f Mon Sep 17 00:00:00 2001 From: Joshua Reynolds Date: Thu, 19 Aug 2021 20:42:52 -0500 Subject: [PATCH 4/4] Guest Mode corrections/clarifications --- tpl/general/settings_inc.guest.tpl.php | 2 +- tpl/general/settings_tuning.tpl.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tpl/general/settings_inc.guest.tpl.php b/tpl/general/settings_inc.guest.tpl.php index 4f05cbd47..3b44079c1 100644 --- a/tpl/general/settings_inc.guest.tpl.php +++ b/tpl/general/settings_inc.guest.tpl.php @@ -10,7 +10,7 @@ build_switch( $id ); ?>
- +
diff --git a/tpl/general/settings_tuning.tpl.php b/tpl/general/settings_tuning.tpl.php index 9eaf42994..5cd6ab1ae 100644 --- a/tpl/general/settings_tuning.tpl.php +++ b/tpl/general/settings_tuning.tpl.php @@ -25,7 +25,7 @@
- +
@@ -47,7 +47,7 @@
- +