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

V8: Use umb-checkbox for RTE configuration (#5119)

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-04-23 14:19:08 +02:00
committed by Sebastiaan Janssen
parent 90cbdbf2cd
commit 9280c74062
3 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/less/rte.less
View File

@@ -66,6 +66,13 @@
/* pre-value editor */
.rte-editor-preval .control-group .controls > div > label .mce-ico {
line-height: 20px;
.rte-editor-preval .control-group .controls > div > label {
cursor: pointer !important;
.mce-cmd .checkbox {
padding-right: 0;
}
.mce-ico {
line-height: 20px;
}
}

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

@@ -31,26 +31,21 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
var icon = getFontIcon(obj.alias);
return angular.extend(obj, {
fontIcon: icon.name,
isCustom: icon.isCustom
isCustom: icon.isCustom,
selected: $scope.model.value.toolbar.indexOf(obj.alias) >= 0
});
});
});
stylesheetResource.getAll().then(function(stylesheets){
$scope.stylesheets = stylesheets;
_.each($scope.stylesheets, function (stylesheet) {
// support both current format (full stylesheet path) and legacy format (stylesheet name only)
stylesheet.selected = $scope.model.value.stylesheets.indexOf(stylesheet.path) >= 0 ||$scope.model.value.stylesheets.indexOf(stylesheet.name) >= 0;
});
});
$scope.commandSelected = function(cmd) {
cmd.selected = $scope.model.value.toolbar.indexOf(cmd.alias) >= 0;
return cmd.selected;
};
$scope.cssSelected = function (css) {
// support both current format (full stylesheet path) and legacy format (stylesheet name only)
css.selected = $scope.model.value.stylesheets.indexOf(css.path) >= 0 ||$scope.model.value.stylesheets.indexOf(css.name) >= 0;
return css.selected;
}
$scope.selectCommand = function(command){
var index = $scope.model.value.toolbar.indexOf(command.alias);

23
src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
View File

@@ -3,11 +3,10 @@
<umb-control-group label="Toolbar" description="Pick the toolbar options that should be available when editing">
<div ng-repeat="cmd in tinyMceConfig.commands">
<label>
<input type="checkbox"
ng-checked="commandSelected(cmd)"
ng-model="cmd.selected"
ng-change="selectCommand(cmd)" />
<umb-checkbox model="cmd.selected"
on-change="selectCommand(cmd)"
class="mce-cmd" />
<!--<img ng-src="{{cmd.icon}}" />-->
<i class="mce-ico" ng-class="(cmd.isCustom ? ' mce-i-custom ' : ' mce-i-') + cmd.fontIcon"></i>
@@ -18,20 +17,18 @@
<umb-control-group label="Stylesheets" description="Pick the stylesheets whose editor styles should be available when editing">
<div ng-repeat="css in stylesheets">
<label>
<input type="checkbox"
ng-checked="cssSelected(css)"
ng-model="css.selected"
ng-change="selectStylesheet(css)" />
{{css.name}}
</label>
<umb-checkbox
model="css.selected"
on-change="selectStylesheet(css)"
text="{{css.name}}"/>
</div>
</umb-control-group>
<umb-control-group label="Ignore user start nodes" description="Selecting this option allows a user to choose nodes that they normally don't have access to.<br /> <em>Note: this applies only to rich text editors in this grid editor.</em>">
<div>
<label>
<input type="checkbox" ng-model="model.value.ignoreUserStartNodes" />
<umb-checkbox model="model.value.ignoreUserStartNodes"/>
</label>
</div>
</umb-control-group>