Ensures the tinymce baseURL is set before it's initialized so that when we minify it's assets it knows where to load more assets from.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user