yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrap rules request in a $q.all() to await response

Browse Source
This commit is contained in:
perploug
2013-11-19 11:10:01 +01:00
parent f749886bf4
commit fb1d6436b7
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
View File

@@ -1,6 +1,6 @@
angular.module("umbraco")
.controller("Umbraco.PropertyEditors.RTEController",
function ($rootScope, $element, $scope, dialogService, $log, imageHelper, assetsService, $timeout, tinyMceService, angularHelper, stylesheetResource) {
function ($rootScope, $element, $scope, $q, dialogService, $log, imageHelper, assetsService, $timeout, tinyMceService, angularHelper, stylesheetResource) {
tinyMceService.configuration().then(function(tinyMceConfig){
@@ -27,11 +27,16 @@ angular.module("umbraco")
var toolbar = editorConfig.toolbar.join(" | ");
var stylesheets = [];
var styleFormats = [];
var await = [];
//queue file loading
await.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
//queue rules loading
angular.forEach(editorConfig.stylesheets, function(val, key){
stylesheets.push("/css/" + val + ".css");
stylesheets.push("/css/" + val + ".css?" + new Date().getTime());
stylesheetResource.getRulesByName(val).then(function(rules) {
await.push(stylesheetResource.getRulesByName(val).then(function(rules) {
angular.forEach(rules, function(rule) {
var r = {};
r.title = rule.name;
@@ -49,11 +54,12 @@ angular.module("umbraco")
styleFormats.push(r);
});
});
}));
});
assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope).then(function () {
//wait for queue to end
$q.all(await).then(function () {
/** Loads in the editor */
function loadTinyMce() {
@@ -126,7 +132,7 @@ angular.module("umbraco")
tinyMceService.createInsertMacro(editor, $scope);
}
});
}, 1);
}, 500);
}
loadTinyMce();