Skip to content

Commit ea4b71a

Browse files
author
Robert He
committed
MAGETWO-89657: Add color formats and converters
- added preferred color format converter
1 parent 6ea9699 commit ea4b71a

File tree

4 files changed

+34
-13
lines changed

4 files changed

+34
-13
lines changed

app/code/Magento/Ui/view/base/web/js/form/element/colorPicker.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ define([
88
'uiLayout',
99
'mage/translate',
1010
'Magento_Ui/js/form/element/abstract',
11-
'spectrum',
12-
'tinycolor'
13-
], function ($, _, layout, $t, Abstract, spectrum, tinycolor) {
11+
'spectrum'
12+
], function ($, _, layout, $t, Abstract, spectrum) {
1413
'use strict';
1514

1615
var defaultColorPalette = [
@@ -45,8 +44,16 @@ define([
4544
initialize: function () {
4645
this._super();
4746
this.colorPickerConfig.value = this.value;
47+
// $(document).on('click', '.sp-replacer', function () {
48+
// this.focused(true);
49+
// });
4850
return this;
49-
}
51+
},
52+
53+
// setFocus: function () {
54+
// this.focused(true);
55+
// }
56+
5057
});
5158
});
5259

app/code/Magento/Ui/view/base/web/js/lib/knockout/bindings/colorPicker.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,22 @@ define([
2323
init: function (element, valueAccessor, allBindings, viewModel) {
2424
var config = valueAccessor();
2525
config.change = function (value) {
26+
if (value == null) {
27+
value = '';
28+
}
2629
config.value(value.toString());
2730
};
2831
config.hide = function (value) {
32+
if (value == null) {
33+
value = '';
34+
}
2935
config.value(value.toString());
3036
};
3137
$(element).spectrum(config);
3238
},
3339

3440
update: function(element, valueAccessor, allBindings, viewModel) {
3541
var config = valueAccessor();
36-
console.log(config.value());
3742
$(element).spectrum("set", config.value());
3843
}
3944
};

app/code/Magento/Ui/view/base/web/templates/form/element/colorPicker.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
<div class="admin__field"
88
visible="visible"
99
css="$data.additionalClasses">
10-
<input type="hidden" class="colorpicker-spectrum" data-bind="
11-
colorPicker: colorPickerConfig,
12-
" style="display: none"/>
10+
<input type="hidden" class="colorpicker-spectrum" data-bind="colorPicker: colorPickerConfig" />
1311
<input type="text" class="colorpicker-input" data-bind="
1412
value: value,
15-
hasFocus: focused,
16-
" style="vertical-align: middle"/>
13+
hasFocus: true,
14+
attr: { placeholder: placeholder }" />
1715
</div>

app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/spectrum.less

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ Author: Brian Grinstead
66
License: MIT
77
***/
88

9+
.colorpicker-spectrum {
10+
display: none;
11+
}
12+
13+
.colorpicker-input {
14+
vertical-align: middle;
15+
}
16+
917
.sp-container {
1018
position:absolute;
1119
margin-top: 2px;
@@ -377,6 +385,7 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
377385
background: #eaeaea;
378386
color: #333;
379387
vertical-align: middle;
388+
box-sizing: border-box;
380389
}
381390
.sp-replacer:hover, .sp-replacer.sp-active {
382391
border-color: #1979c3;
@@ -396,8 +405,8 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
396405
}
397406
.sp-preview {
398407
position:relative;
399-
width:25px;
400-
height: 24px;
408+
width: 25px;
409+
height: 25px;
401410
border: solid 1px #9d9d9d;
402411
float:left;
403412
z-index: 0;
@@ -505,7 +514,9 @@ See http://bgrins.github.io/spectrum/themes/ for instructions.
505514
.sp-clear-display {
506515
background-repeat:no-repeat;
507516
background-position: center;
508-
background-image: url(data:image/gif;base64,R0lGODlhFAAUAPcAAAAAAJmZmZ2dnZ6enqKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq/Hx8fLy8vT09PX19ff39/j4+Pn5+fr6+vv7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAP8ALAAAAAAUABQAAAihAP9FoPCvoMGDBy08+EdhQAIJCCMybCDAAYUEARBAlFiQQoMABQhKUJBxY0SPICEYHBnggEmDKAuoPMjS5cGYMxHW3IiT478JJA8M/CjTZ0GgLRekNGpwAsYABHIypcAgQMsITDtWJYBR6NSqMico9cqR6tKfY7GeBCuVwlipDNmefAtTrkSzB1RaIAoXodsABiZAEFB06gIBWC1mLVgBa0AAOw==);
517+
//background-image: url(data:image/gif;base64,R0lGODlhFAAUAPcAAAAAAJmZmZ2dnZ6enqKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq/Hx8fLy8vT09PX19ff39/j4+Pn5+fr6+vv7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAP8ALAAAAAAUABQAAAihAP9FoPCvoMGDBy08+EdhQAIJCCMybCDAAYUEARBAlFiQQoMABQhKUJBxY0SPICEYHBnggEmDKAuoPMjS5cGYMxHW3IiT478JJA8M/CjTZ0GgLRekNGpwAsYABHIypcAgQMsITDtWJYBR6NSqMico9cqR6tKfY7GeBCuVwlipDNmefAtTrkSzB1RaIAoXodsABiZAEFB06gIBWC1mLVgBa0AAOw==);
518+
background-color: #fff;
519+
background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNSIgaGVpZ2h0PSIyNSIgc3R5bGU9ImJhY2tncm91bmQ6I2ZmZiIgdmlld0JveD0iMCAwIDI1IDI1Ij4KICA8cGF0aCBmaWxsPSJub25lIiBzdHJva2U9IiNGMDAiIHN0cm9rZS1saW5lY2FwPSJzcXVhcmUiIGQ9Ik0wLjUsMC41IEwyNS41LDI0LjUiLz4KPC9zdmc+Cg==);
509520
}
510521

511522
.sp-palette-row-selection {

0 commit comments

Comments
 (0)