DmfManuTheme v2.0.6

digitalmanufaktur · Feb 10, 2023 · 560ccea · 560ccea
1 parent c27eabe
commit 560ccea
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2.0.6
+- Fix for social media icons after 6.4.15.2 security update
+- Fix #14 Cannot read properties of null (reading 'offsetWidth')
+
+# 2.0.5
+- Optimization
+
 # 2.0.4
 - Thumbnail fix
 - Implementation of half stars in ratings

diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
@@ -1,3 +1,10 @@
+# 2.0.6
+- Fix für Social media icons ab 6.4.15.2 security update
+- Fix #14 Cannot read properties of null (reading 'offsetWidth')
+
+# 2.0.5
+- Optimierungen
+
 # 2.0.4
 - Fix der Thumbnail-Anzeige
 - Implementierung von halben Sternen bei Bewertungen

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "dmf/sw6-manu-theme",
     "description": "Manu Theme",
-    "version": "2.0.5",
+    "version": "2.0.6",
     "type": "shopware-platform-plugin",
     "authors": [
         {

diff --git a/src/Resources/app/storefront/dist/storefront/js/dmf-manu-theme.js b/src/Resources/app/storefront/dist/storefront/js/dmf-manu-theme.js
diff --git a/src/Resources/app/storefront/src/js/filter-width/filter-width.plugin.js b/src/Resources/app/storefront/src/js/filter-width/filter-width.plugin.js
@@ -4,7 +4,11 @@ import Plugin from 'src/plugin-system/plugin.class';
 export default class InputSpinner extends Plugin {
     init() {
         this._filterBtn = document.querySelector('.cms-element-sidebar-filter');
-        this._sortBtn = document.querySelector('.sorting')
+        this._sortBtn = document.querySelector('.sorting');
+        if (!this._sortBtn || !this._filterBtn) {
+            return;
+        }
+
         this._sortBtnWidthPx = this._sortBtn.offsetWidth+'px';
         this._windowWidthPx = window.innerWidth+'px';
 
@@ -14,4 +18,4 @@ export default class InputSpinner extends Plugin {
 
         } 
     }
-}
+}
diff --git a/src/Resources/views/storefront/utilities/icon.html.twig b/src/Resources/views/storefront/utilities/icon.html.twig
@@ -4,7 +4,7 @@
     {% if pack is not defined %}
         {% set pack = 'default' %}
     {% endif %}
-    {% set customIcon = source('@DmfManuTheme/../app/storefront/src/assets/icon/'~ pack ~'/'~ name ~'.svg', ignore_missing = true) %}
+    {% set customIcon = source('@DmfManuTheme/app/storefront/src/assets/icon/'~ pack ~'/'~ name ~'.svg', ignore_missing = true) %}
     {% if (customIcon) %}
         {% set styles = [ size, color, rotation, flip, class ] %}
         <span