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

Fix selected color

Browse Source
This commit is contained in:
Kenn Jacobsen
2019-02-01 20:28:27 +01:00
parent 90a282c083
commit 6874a5486b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.controller.js
View File

@@ -49,7 +49,7 @@ function IconPickerController($scope, iconHelper, localizationService) {
});
// set a default color if nothing is passed in
vm.color = $scope.model.color ? $scope.model.color : vm.colors[0].value;
vm.color = $scope.model.color ? findColor($scope.model.color) : vm.colors[0];
// if an icon is passed in - preselect it
vm.icon = $scope.model.icon ? $scope.model.icon : undefined;
@@ -70,9 +70,13 @@ function IconPickerController($scope, iconHelper, localizationService) {
submit();
}
function findColor(value) {
return _.findWhere(vm.colors, {value: value});
}
function selectColor(color, $index, $event) {
$scope.model.color = color.value;
vm.color = color.value;
vm.color = color;
}
function close() {

4
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/iconpicker/iconpicker.html
View File

@@ -44,9 +44,9 @@
<umb-load-indicator ng-if="vm.loading"></umb-load-indicator>
<div class="umb-control-group" ng-show="!vm.loading && filtered.length > 0 ">
<ul class="umb-iconpicker" ng-class="vm.color" ng-show="vm.icons">
<ul class="umb-iconpicker" ng-class="vm.color.value" ng-show="vm.icons">
<li class="umb-iconpicker-item" ng-class="{'-selected': icon == model.icon}" ng-repeat="icon in filtered = (vm.icons | filter: searchTerm) track by $id(icon)">
<a href="#" title="{{icon}}" ng-click="vm.selectIcon(icon, vm.color)" prevent-default>
<a href="#" title="{{icon}}" ng-click="vm.selectIcon(icon, vm.color.value)" prevent-default>
<i class="{{icon}} large"></i>
</a>
</li>