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

#3993 Move color picker fix to correct method and update backwards compatibility test

Browse Source
This commit is contained in:
Sebastiaan Janssen
2019-01-10 15:35:48 +01:00
parent d2baf03119
commit d69f0fe9dd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
View File

@@ -123,11 +123,6 @@ function ColorPickerController($scope) {
if (!$scope.model.value)
return false;
// Backwards compatibility, the color used to be stored as a hex value only
if ($scope.model.value.length === 6) {
$scope.model.value = { value: $scope.model.value, label: $scope.model.value };
}
// Complex color (value and label)?
if (!$scope.model.value.hasOwnProperty("value"))
return $scope.model.value === color.value;
@@ -144,6 +139,11 @@ function ColorPickerController($scope) {
if (!$scope.model.value)
return;
// Backwards compatibility, the color used to be stored as a hex value only
if (typeof $scope.model.value === "string") {
$scope.model.value = { value: $scope.model.value, label: $scope.model.value };
}
// Complex color (value and label)?
if (!$scope.model.value.hasOwnProperty("value"))
return;