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

Fixes: U4-4366 Lots of js errors in RteController when editing the rte data type

Browse Source
This commit is contained in:
Shannon
2014-03-10 14:16:24 +11:00
parent f1963fb404
commit 6446f63dcb
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,13 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
function ($scope, $timeout, $log, tinyMceService, stylesheetResource) {
var cfg = tinyMceService.defaultPrevalues();
if (!$scope.model.value.stylesheets) {
$scope.model.value.stylesheets = [];
}
if (!$scope.model.value.toolbar) {
$scope.model.value.toolbar = [];
}
if($scope.model.value){
if(angular.isString($scope.model.value)){
@@ -21,8 +28,11 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
});
$scope.selected = function(cmd, alias, lookup){
cmd.selected = lookup.indexOf(alias) >= 0;
return cmd.selected;
if (lookup && angular.isArray(lookup)) {
cmd.selected = lookup.indexOf(alias) >= 0;
return cmd.selected;
}
return false;
};
$scope.selectCommand = function(command){
@@ -35,7 +45,8 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
}
};
$scope.selectStylesheet = function(css){
$scope.selectStylesheet = function (css) {
var index = $scope.model.value.stylesheets.indexOf(css.name);
if(css.selected && index === -1){