Merge branch 'release/1.4.25' into v1

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,10 @@
 # ImageOptimize Changelog
 
+## 1.4.25 - 2018.03.30
+### Changed
+* Fixed a typo in the `config.php` settings, changed `generatePlacholders` -> `generatePlaceholders`
+* Made the reduced quality of retina images if `lowerQualityRetinaImageVariants` is enabled less aggressive
+
 ## 1.4.24 - 2018.03.19
 ### Changed
 * Fixed an issue with propagating field data in multi-site environments

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.24",
+    "version": "1.4.25",
     "keywords": [
         "craft",
         "cms",

src/ImageOptimize.php

@@ -84,7 +84,7 @@ class ImageOptimize extends Plugin
     /**
      * @var bool
      */
-    public static $generatePlacholders = true;
+    public static $generatePlaceholders = true;
 
     // Public Methods
     // =========================================================================

src/config.php

@@ -47,7 +47,7 @@
     'generateTransformsBeforePageLoad' => true,
 
     // Set to false to disable all placeholder generation
-    'generatePlacholders' => true,
+    'generatePlaceholders' => true,
 
     // Controls whether a dominant color palette should be created for image variants
     // It takes a bit of time, so if you never plan to use it, you can turn it off

src/fields/OptimizedImages.php

@@ -90,8 +90,10 @@ class OptimizedImages extends Field
     public function __construct(array $config = [])
     {
         // Unset any deprecated properties
-        unset($config['transformMethod']);
-        unset($config['imgixDomain']);
+        if (!empty($config)) {
+            unset($config['transformMethod']);
+            unset($config['imgixDomain']);
+        }
         parent::__construct($config);
     }
 

src/models/Settings.php

@@ -66,7 +66,7 @@ class Settings extends Model
     /**
      * @var bool Set to false to disable all placeholder generation
      */
-    public $generatePlacholders = true;
+    public $generatePlaceholders = true;
 
     /**
      * @var bool Controls whether a dominant color palette should be created
@@ -256,6 +256,18 @@ class Settings extends Model
     // Public Methods
     // =========================================================================
 
+    /**
+     * @inheritdoc
+     */
+    public function __construct(array $config = [])
+    {
+        // Unset any deprecated properties
+        if (!empty($config)) {
+            unset($config['generatePlacholders']);
+        }
+        parent::__construct($config);
+    }
+
     /**
      * @inheritdoc
      */

src/services/Optimize.php

@@ -106,7 +106,7 @@ public function handleGenerateTransformEvent(GenerateTransformEvent $event)
 
         $settings = ImageOptimize::$plugin->getSettings();
         // Only do this for local Craft transforms
-        if ($settings->transformMethod == 'craft' && !empty($event->asset) && ImageOptimize::$generatePlacholders) {
+        if ($settings->transformMethod == 'craft' && !empty($event->asset) && ImageOptimize::$generatePlaceholders) {
             // Apply any filters to the image
             if (!empty($event->transformIndex->transform)) {
                 $this->applyFiltersToImage($event->transformIndex->transform, $event->asset, $event->image);

src/services/OptimizedImages.php

@@ -150,7 +150,7 @@ public function populateOptimizedImageModel(Asset $asset, $variants, OptimizedIm
     protected function generatePlaceholders(Asset $element, OptimizedImage $model, $aspectRatio)
     {
         $settings = ImageOptimize::$plugin->getSettings();
-        if ($settings->generatePlacholders && ImageOptimize::$generatePlacholders) {
+        if ($settings->generatePlaceholders && ImageOptimize::$generatePlaceholdersholders) {
             $placeholder = ImageOptimize::$plugin->placeholder;
             if ($element->focalPoint) {
                 $position = $element->getFocalPoint();
@@ -199,7 +199,7 @@ protected function getTransformFromVariant(Asset $asset, $variant, $retinaSize):
         // Image quality
         $quality = $variant['quality'];
         if ($settings->lowerQualityRetinaImageVariants && $retinaSize != '1') {
-            $quality = intval($quality * (1 / intval($retinaSize)));
+            $quality = intval($quality * (1.5 / intval($retinaSize)));
         }
         $transform->quality = $quality;
         // Interlaced (progressive JPEGs or interlaced PNGs)
@@ -284,7 +284,7 @@ public function updateOptimizedImageFieldData(Field $field, ElementInterface $as
                     ->update($table, [
                         $column => $data,
                     ], [
-                        'elementId' => $asset->getId(),
+                        'id' => $asset->contentId,
                     ], [], false)
                     ->execute();
             }

src/variables/ImageOptimizeVariable.php

@@ -44,17 +44,17 @@ public function placeholderBox($width, $height, $color = null)
     /**
      * @param Asset $asset
      * @param array $variants
-     * @param bool  $generatePlacholders
+     * @param bool  $generatePlaceholders
      *
      * @return OptimizedImage|null
      */
     public function createOptimizedImages(
         Asset $asset,
         $variants = null,
-        $generatePlacholders = false
+        $generatePlaceholders = false
     ) {
         // Override our settings for lengthy operations, since we're doing this via Twig
-        ImageOptimize::$generatePlacholders = $generatePlacholders;
+        ImageOptimize::$generatePlaceholders = $generatePlaceholders;
 
         return ImageOptimize::$plugin->optimizedImages->createOptimizedImages($asset, $variants);
     }