Merge pull request #356 from mattbrailsford/7.1.2-rtetinymcecheck

Added check to rte controller so as not to reload tinymce script
2014-04-28 12:32:15 +10:00
parent 32c8a83449 d66998a3e3
commit 475e6970f9
1 changed files with 3 additions and 1 deletions
--- 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 (typeof tinymce === "undefined") { // 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){