Changeset 2602929

Timestamp:

09/22/2021 11:04:05 AM (4 years ago)

Author:

john1302

Message:

Add hook level option

Location:

wp-lozad/trunk

Files:

• classes/FrontPageProcessing.php (modified) (4 diffs)
• classes/settings/AdminSettingsPage.php (modified) (2 diffs)
• classes/settings/SettingsConstants.php (modified) (3 diffs)
• lozad.php (modified) (1 diff)
• readme.txt (modified) (1 diff)

wp-lozad/trunk/classes/FrontPageProcessing.php

@@ -15 +15 @@
     {
         add_action('wp_enqueue_scripts', function () {
-            $pluginOptions = get_option(SettingsConstants::PAGE_SETTING_OPTION_NAME);
-
             $pluginDirUrl = plugin_dir_url(__DIR__);
-            $includeInFooter = isset($pluginOptions[SettingsConstants::SETTING_WHERE_INCLUDE_SCRIPT])
-                && $pluginOptions[SettingsConstants::SETTING_WHERE_INCLUDE_SCRIPT];
+            $includeInFooter = (bool) $this->getPluginOptionsValue(SettingsConstants::SETTING_WHERE_INCLUDE_SCRIPT);
 
             wp_enqueue_script('jquery');
@@ -33 +30 @@
             }
 
+            $hookLevel = (int) $this->getPluginOptionsValue(SettingsConstants::SETTING_SCRIPT_HOOK_LEVEL);
+            if ($hookLevel < 10) {
+                $hookLevel = 10;
+            }
+
             global $cache_enabled;
             if (has_filter('final_output')) {
-                add_filter('final_output', [$this, 'lozadContentProcessing']);
+                add_filter('final_output', [$this, 'lozadContentProcessing'], $hookLevel);
             } elseif (
                 $cache_enabled
@@ -41 +43 @@
                 && function_exists('wpsc_is_backend') && !wpsc_is_backend()
             ) {
-                add_filter('wp_cache_ob_callback_filter', [$this, 'lozadContentProcessing']);
+                add_filter('wp_cache_ob_callback_filter', [$this, 'lozadContentProcessing'], $hookLevel);
             } else {
-                add_action('template_redirect', [$this, 'lozadContentProcessing']);
+                add_action('template_redirect', [$this, 'lozadContentProcessing'], $hookLevel);
             }
             return true;
@@ -53 +55 @@
         return (new ContentProcessing($content))->handle();
     }
+
+    private function getPluginOptionsValue($option)
+    {
+        return get_option(SettingsConstants::PAGE_SETTING_OPTION_NAME)[$option] ?? null;
+    }
 }

wp-lozad/trunk/classes/settings/AdminSettingsPage.php

@@ -91 +91 @@
         $optionName = $args['name'];
         $value = get_option(SettingsConstants::PAGE_SETTING_OPTION_NAME);
-        $value = isset($value[$optionName]) ? $value[$optionName] : null;
+        $value = $value[$optionName] ?? null;
         $optionConfig = $args['optionConf'];
         $formOptionName = SettingsConstants::PAGE_SETTING_OPTION_NAME . '[' . $optionName . ']';
@@ -104 +104 @@
     public function submitAction($options)
     {
-        foreach ($options as $name => & $val) {
-            if($name == SettingsConstants::SETTING_SKIPPED_CLASSES_STRING) {
+        foreach ($options as $name => &$val) {
+            if (in_array($name, [SettingsConstants::SETTING_SKIPPED_CLASSES_STRING, SettingsConstants::SETTING_SCRIPT_HOOK_LEVEL])) {
                 $val = strip_tags($val);
+                if ($name == SettingsConstants::SETTING_SCRIPT_HOOK_LEVEL && (int) $val < 10) {
+                    $val = '';
+                }
             } else {
                 $val = intval($val);

wp-lozad/trunk/classes/settings/SettingsConstants.php

@@ -20 +20 @@
     const SETTING_SKIPPED_CLASSES_STRING = 'skipped_classes_string';
     const SETTING_ENABLE_LAZY_LOAD_IMAGE_SIZES = 'enable_lazy_load_image_sizes';
+    const SETTING_SCRIPT_HOOK_LEVEL = 'lazy_load_hook_level'; // default -10
 
     const OPTION_DISPLAY_TYPE_CHECKBOX = 'checkbox';
@@ -33 +34 @@
         $skippedClassesOption['placeholder'] = 'Ex. class1, class2, class3';
 
+        $hookLevelOption = self::getOptionConfigArr(__('Hook level'), self::OPTION_DISPLAY_TYPE_INPUT);
+        $hookLevelOption['placeholder'] = 'Default and min 10';
+
         return [
             self::SETTING_ENABLE_LAZY_LOAD => self::getOptionConfigArr(__('Enable Lazy Load')),
@@ -43 +47 @@
             self::SETTING_ENABLE_LAZY_LOAD_VIDEO => self::getOptionConfigArr(__('Enable Lazy Load for Video')),
             self::SETTING_WHERE_INCLUDE_SCRIPT => $whereIncludeOption,
-            self::SETTING_SKIPPED_CLASSES_STRING => $skippedClassesOption
+            self::SETTING_SKIPPED_CLASSES_STRING => $skippedClassesOption,
+            self::SETTING_SCRIPT_HOOK_LEVEL => $hookLevelOption
         ];
     }

wp-lozad/trunk/lozad.php

@@ -4 +4 @@
 Description: lazy loading of images by baroda algorithm
 Author: Evgeniy Kozenok
-Version: 1.4.9
+Version: 1.5.0
 */
 

wp-lozad/trunk/readme.txt

@@ -3 +3 @@
 Tags: image, lazyload, lozad, front, posts, html processing
 Requires at least: 5.0
-Tested up to: 5.5
-Stable tag: 1.4.9
+Tested up to: 5.8
+Stable tag: 1.5.0
 License: GPL2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html