Skip to content

Commit

Permalink
Merge pull request #7341 in SW/shopware from sw-23335/5.5/fix-broken-…
Browse files Browse the repository at this point in the history
…resize-emotion-layout to 5.5

* commit '521b339ba53d8918dc05359431c548ba9e879954':
  SW-23335 - Fix an issue with emotions using the 'resize' layout
  • Loading branch information
shyim committed Jan 21, 2019
2 parents 0155243 + 521b339 commit 308733c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
8 changes: 8 additions & 0 deletions UPGRADE-5.5.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
/**
* The DOM selector of emotion wrapper elements
*
* @property wrapperSelector,
* @property wrapperSelector
* @type {string}
*/
wrapperSelector: '.emotion--wrapper',
Expand Down Expand Up @@ -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',
},

/**
Expand Down

0 comments on commit 308733c

Please sign in to comment.