Merge branch 'release/1.4.23' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,10 @@
 # ImageOptimize Changelog
 
+## 1.4.23 - 2018.03.03
+### Changed
+* The lengthy generation of placeholders should _really_ be off by default when doing them via Twig now
+* Asset move operations now cause Optimized Image Variants to be re-saved via a non-blocking queue job
+
 ## 1.4.22 - 2018.03.02
 ### Changed
 * Using Image Optimize via Twig should have less of a performance hit now, since all placeholder image/color palette generation is disabled

composer.json

@@ -2,7 +2,7 @@
     "name": "nystudio107/craft-imageoptimize",
     "description": "Automatically create & optimize responsive image transforms, using either native Craft transforms or a service like Imgix, with zero template changes.",
     "type": "craft-plugin",
-    "version": "1.4.22",
+    "version": "1.4.23",
     "keywords": [
         "craft",
         "cms",

src/ImageOptimize.php

@@ -82,6 +82,11 @@ class ImageOptimize extends Plugin
      */
     public static $transformParams;
 
+    /**
+     * @var bool
+     */
+    public static $generatePlacholders = true;
+
     // Public Methods
     // =========================================================================
 

src/fields/OptimizedImages.php

@@ -154,7 +154,9 @@ public function afterElementSave(ElementInterface $asset, bool $isNew)
         parent::afterElementSave($asset, $isNew);
         // Update our OptimizedImages Field data now that the Asset has been saved
         if ($asset instanceof Asset) {
-            if ($isNew) {
+            // If the scenario is Asset::SCENARIO_FILEOPS or Asset::SCENARIO_ESSENTIALS treat it as a new asset
+            $scenario = $asset->getScenario();
+            if ($isNew || $scenario == Asset::SCENARIO_FILEOPS || $asset->propagating) {
                 /**
                  * If this is a newly uploaded/created Asset, we can save the variants
                  * via a queue job to prevent it from blocking

src/services/OptimizedImages.php

@@ -152,7 +152,7 @@ public function populateOptimizedImageModel(Asset $asset, $variants, OptimizedIm
     protected function generatePlaceholders(Asset $element, OptimizedImage $model, $aspectRatio)
     {
         $settings = ImageOptimize::$plugin->getSettings();
-        if ($settings->generatePlacholders) {
+        if ($settings->generatePlacholders && ImageOptimize::$generatePlacholders) {
             $placeholder = ImageOptimize::$plugin->placeholder;
             if ($element->focalPoint) {
                 $position = $element->getFocalPoint();

src/variables/ImageOptimizeVariable.php

@@ -53,8 +53,7 @@ public function createOptimizedImages(
         $generatePlacholders = false
     ) {
         // Override our settings for lengthy operations, since we're doing this via Twig
-        $settings = ImageOptimize::$plugin->getSettings();
-        $settings->generatePlacholders = $generatePlacholders;
+        ImageOptimize::$generatePlacholders = $generatePlacholders;
 
         return ImageOptimize::$plugin->optimizedImages->createOptimizedImages($asset, $variants);
     }