From fe4da60b15d7c10c21319e96bf0803b6e86ff35c Mon Sep 17 00:00:00 2001 From: mattbrailsford Date: Fri, 18 Apr 2014 15:43:36 +0100 Subject: [PATCH 1/2] Added check to rte controller so as not to reload tinymce script if it's already loaded (we don't check the CSS, but I figure this is ok) [This is temp bandaid for #U4-4724] --- .../src/views/propertyeditors/rte/rte.controller.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 daf058f313..e4cc237556 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 @@ -30,7 +30,9 @@ angular.module("umbraco") var await = []; //queue file loading - await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope)); + if (!tinymce) { // Don't reload tinymce if already loaded + await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope)); + } //queue rules loading angular.forEach(editorConfig.stylesheets, function(val, key){ From d66998a3e30dcf9d9b499be3cbfd25d899b37ea4 Mon Sep 17 00:00:00 2001 From: mattbrailsford Date: Fri, 18 Apr 2014 15:52:26 +0100 Subject: [PATCH 2/2] A better test (checks to see if it's even defined) --- .../src/views/propertyeditors/rte/rte.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e4cc237556..fbcb11a234 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 @@ -30,7 +30,7 @@ angular.module("umbraco") var await = []; //queue file loading - if (!tinymce) { // Don't reload tinymce if already loaded + if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope)); }