SW-23335 - Fix an issue with emotions using the 'resize' layout

shopware5 · Jan 21, 2019 · 521b339 · 521b339
1 parent 0155243
commit 521b339
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/UPGRADE-5.5.md b/UPGRADE-5.5.md
@@ -2,6 +2,14 @@
 
 This changelog references changes done in Shopware 5.5 patch versions.
 
+## 5.5.6
+
+[View all changes from v5.5.5...v5.5.6](https://github.com/shopware/shopware/compare/v5.5.5...v5.5.6)
+
+### Changes
+
+* Changed the selector for the emotion-wrapper in `jquery.emotion.js` to fix an issue with emotions using the 'resize' layout 
+
 ## 5.5.5
 
 [View all changes from v5.5.4...v5.5.5](https://github.com/shopware/shopware/compare/v5.5.4...v5.5.5)

diff --git a/themes/Frontend/Responsive/frontend/_public/src/js/jquery.emotion.js b/themes/Frontend/Responsive/frontend/_public/src/js/jquery.emotion.js
@@ -50,7 +50,7 @@
             /**
              * The DOM selector of emotion wrapper elements
              *
-             * @property wrapperSelector,
+             * @property wrapperSelector
              * @type {string}
              */
             wrapperSelector: '.emotion--wrapper',
@@ -330,7 +330,15 @@
              * @property videoElSelector
              * @type {string}
              */
-            videoElSelector: '.emotion--video'
+            videoElSelector: '.emotion--video',
+
+            /**
+             * The DOM selector of emotion wrapper elements
+             *
+             * @property wrapperSelector
+             * @type {string}
+             */
+            wrapperSelector: '.emotion--wrapper',
         },
 
         /**