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 af82199d55..f606c0539a 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 @@ -144,7 +144,6 @@ angular.module("umbraco.directives") //we need to add a timeout here, to force a redraw so TinyMCE can find //the elements needed $timeout(function () { - tinymce.DOM.events.domLoaded = true; tinymce.init(baseLineConfigObj); }, 150, false); } diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index 8f37f872b1..6b1e6fa853 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -242,6 +242,10 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s */ getTinyMceEditorConfig: function (args) { + //global defaults, called before/during init + tinymce.DOM.events.domLoaded = true; + tinymce.baseURL = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/lib/tinymce/"; // trailing slash important + var promises = [ this.configuration(), getStyles(args.stylesheets) 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 48170fb4b7..16fa79f667 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 @@ -84,8 +84,7 @@ angular.module("umbraco") //we need to add a timeout here, to force a redraw so TinyMCE can find //the elements needed - $timeout(function () { - tinymce.DOM.events.domLoaded = true; + $timeout(function () { tinymce.init(baseLineConfigObj); }, 200); }