yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved support for TinyMCE custom style formats (#13582)

Browse Source
This commit is contained in:
Kenn Jacobsen
2022-12-16 12:41:19 +01:00
committed by nikolajlauridsen
parent 48f4d8b7d1
commit a897e3bdd3
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
View File

@@ -170,9 +170,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
}));
});
}
else {
styleFormats = fallbackStyles;
}
return $q.all(promises).then(function () {
// Always push our Umbraco RTE stylesheet
@@ -375,7 +372,6 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
autoresize_bottom_margin: 10,
content_css: styles.stylesheets,
style_formats: styles.styleFormats,
style_formats_autohide: true,
language: getLanguage(),
//this would be for a theme other than inlite
@@ -450,9 +446,20 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
}
}
// if we have style_formats at this point they originate from the RTE CSS config. we don't want any custom
// style_formats to interfere with the RTE CSS config, so let's explicitly remove the custom style_formats.
if(tinyMceConfig.customConfig.style_formats && config.style_formats && config.style_formats.length){
delete tinyMceConfig.customConfig.style_formats;
}
Utilities.extend(config, tinyMceConfig.customConfig);
}
if(!config.style_formats || !config.style_formats.length){
// if we have no style_formats at this point we'll revert to using the default ones (fallbackStyles)
config.style_formats = fallbackStyles;
}
return config;
});