Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Always fetch styles from WooCommerce [MAILPOET-2569]

Browse Source
This commit is contained in:
wxa
2019-12-12 15:09:03 +03:00
committed by wxa
parent 94f1ab0093
commit f9ec25213d
7 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/newsletter_editor/components/styles.js
View File

@ -89,6 +89,7 @@ App.on('before:start', function (BeforeStartApp, options) { // eslint-disable-li
var Application = BeforeStartApp;
var body;
var globalStyles;
var overriddenGlobalStyles;
// Expose style methods to global application
Application.getGlobalStyles = Module.getGlobalStyles;
Application.setGlobalStyles = Module.setGlobalStyles;
@ -96,7 +97,8 @@ App.on('before:start', function (BeforeStartApp, options) { // eslint-disable-li
body = options.newsletter.body;
globalStyles = (_.has(body, 'globalStyles')) ? body.globalStyles : {};
this.setGlobalStyles(globalStyles);
overriddenGlobalStyles = (_.has(options.config, 'overrideGlobalStyles')) ? options.config.overrideGlobalStyles : {};
this.setGlobalStyles(jQuery.extend(true, {}, globalStyles, overriddenGlobalStyles));
});
App.on('start', function (StartApp) { // eslint-disable-line func-names