From 161a19a82b72a7ba0ef3d85701fc0c972d02fe06 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 27 Feb 2018 01:12:17 +1100 Subject: [PATCH] Adds cache busting for TinyMCE --- .../directives/components/grid/grid.rte.directive.js | 4 +++- .../src/views/propertyeditors/rte/rte.controller.js | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js index 0b2853a174..90daac73db 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js @@ -115,7 +115,9 @@ angular.module("umbraco.directives") toolbar: toolbar, content_css: stylesheets, style_formats: styleFormats, - autoresize_bottom_margin: 0 + autoresize_bottom_margin: 0, + //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix + cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster }; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js index a11a4dae9f..24d5e7830e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js @@ -139,6 +139,7 @@ angular.module("umbraco") //wait for queue to end $q.all(await).then(function () { + //create a baseline Config to exten upon var baseLineConfigObj = { mode: "exact", @@ -149,14 +150,16 @@ angular.module("umbraco") extended_valid_elements: extendedValidElements, menubar: false, statusbar: false, + relative_urls: false, height: editorConfig.dimensions.height, width: editorConfig.dimensions.width, maxImageSize: editorConfig.maxImageSize, toolbar: toolbar, content_css: stylesheets, - relative_urls: false, style_formats: styleFormats, - language: language + language: language, + //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix + cache_suffix: "?umb__rnd=" + Umbraco.Sys.ServerVariables.application.cacheBuster }; if (tinyMceConfig.customConfig) {