Merge branch 'release/1.6.46' into v1

nystudio107 · Jun 29, 2022 · f65c917 · f65c917
2 parents 31d0f1f + f6b80fa
commit f65c917
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ImageOptimize Changelog
 
+## 1.6.46 - 2022.06.29
+### Fixed
+* Fixed an issue that could throw an exception when double-clicking on an asset, due to an incorrect asset bundle path
+
 ## 1.6.45 - 2022.06.28
 ### Changed
 * If there's no transform requested, and we're not using some external service for image transforms, return `null` so other plugins have a crack at it

diff --git a/composer.json b/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.6.45",
+  "version": "1.6.46",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/templates/_components/fields/OptimizedImages_input.twig b/src/templates/_components/fields/OptimizedImages_input.twig
@@ -14,7 +14,7 @@
 #}
 
 {% do view.registerAssetBundle("nystudio107\\imageoptimize\\assetbundles\\imageoptimize\\ImageOptimizeAsset") %}
-{% set baseAssetsUrl = view.getAssetManager().getPublishedUrl('@nystudio107/imageoptimize/assetbundles/imageoptimize/dist', true) %}
+{% set baseAssetsUrl = view.getAssetManager().getPublishedUrl('@nystudio107/imageoptimize/web/assets/dist', true) %}
 
 {% set tagOptions = {
     'depends': [

diff --git a/src/templates/welcome.twig b/src/templates/welcome.twig
@@ -7,7 +7,7 @@
 {% set docsUrl = "https://github.com/nystudio107/craft-imageoptimize/blob/v1/README.md" %}
 
 {% do view.registerAssetBundle("nystudio107\\imageoptimize\\assetbundles\\imageoptimize\\ImageOptimizeAsset") %}
-{% set baseAssetsUrl = view.getAssetManager().getPublishedUrl('@nystudio107/imageoptimize/assetbundles/imageoptimize/dist', true) %}
+{% set baseAssetsUrl = view.getAssetManager().getPublishedUrl('@nystudio107/nystudio107/imageoptimize/web/assets/dist', true) %}
 
 {% set crumbs = [
     { label: "ImageOptimize", url: url('image-optimize') },
@@ -18,17 +18,24 @@
     <div id="cp-nav-content" class="readable" style="text-align:center; margin:0 auto; padding: 5% 10%;">
         <confetti-party>
         </confetti-party>
-        <img src="{{ baseAssetsUrl ~ '/img/ImageOptimize-icon.svg' }}" width="30%" height="auto" />
+        <img src="{{ baseAssetsUrl ~ '/img/ImageOptimize-icon.svg' }}" width="30%" height="auto"/>
         <h2>Thanks for using ImageOptimize!</h2>
-        <p>ImageOptimize allows you to automatically create & optimize responsive image transforms from your Craft CMS assets.</p>
-        <p>It works equally well with native Craft image transforms, and image services like <a href="https://imgix.com" target="_blank" rel="noopener">imgix</a>, with zero template changes.</p>
+        <p>ImageOptimize allows you to automatically create & optimize responsive image transforms from your Craft CMS
+            assets.</p>
+        <p>It works equally well with native Craft image transforms, and image services like <a href="https://imgix.com"
+                                                                                                target="_blank"
+                                                                                                rel="noopener">imgix</a>,
+            with zero template changes.</p>
 
-        <p>We hope you love it! For more information, please <a href="{{ docsUrl }}" target="_blank" rel="noopener">see the documentation</a>.</p>
+        <p>We hope you love it! For more information, please <a href="{{ docsUrl }}" target="_blank" rel="noopener">see
+                the documentation</a>.</p>
         <p>
             &nbsp;
         </p>
         <p>
-            <a href="{{ linkGetStarted }}"><button class="btn submit">Get Started</button></a>
+            <a href="{{ linkGetStarted }}">
+                <button class="btn submit">Get Started</button>
+            </a>
         </p>
     </div>
     <div style="text-align:center; margin:0 auto; padding: 0;">