aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/dialog
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-04-04 19:39:34 +0500
committerAbyss777 <abyss@fox5.ru>2017-04-04 19:42:25 +0500
commit94fc6862c6635c680afc600a19f61fb9aaefe0ef (patch)
tree00693460968119883d62d97e6c3f70f613a1bafd /web/app/view/dialog
parent8c4337fb90487ce9986ab67fcb695a53e90f74d9 (diff)
downloadtrackermap-web-94fc6862c6635c680afc600a19f61fb9aaefe0ef.tar.gz
trackermap-web-94fc6862c6635c680afc600a19f61fb9aaefe0ef.tar.bz2
trackermap-web-94fc6862c6635c680afc600a19f61fb9aaefe0ef.zip
Use simple color picker instead of ux
Diffstat (limited to 'web/app/view/dialog')
-rw-r--r--web/app/view/dialog/Attribute.js3
-rw-r--r--web/app/view/dialog/AttributeController.js9
2 files changed, 3 insertions, 9 deletions
diff --git a/web/app/view/dialog/Attribute.js b/web/app/view/dialog/Attribute.js
index 7f0de788..6614c87f 100644
--- a/web/app/view/dialog/Attribute.js
+++ b/web/app/view/dialog/Attribute.js
@@ -19,7 +19,8 @@ Ext.define('Traccar.view.dialog.Attribute', {
extend: 'Traccar.view.dialog.Base',
requires: [
- 'Traccar.view.dialog.AttributeController'
+ 'Traccar.view.dialog.AttributeController',
+ 'Traccar.view.ColorPicker'
],
controller: 'attribute',
diff --git a/web/app/view/dialog/AttributeController.js b/web/app/view/dialog/AttributeController.js
index daa33be2..7ddab11c 100644
--- a/web/app/view/dialog/AttributeController.js
+++ b/web/app/view/dialog/AttributeController.js
@@ -72,14 +72,7 @@ Ext.define('Traccar.view.dialog.AttributeController', {
config.inputValue = true;
config.uncheckedValue = false;
} else if (type === 'color') {
- config.xtype = 'colorfield';
- config.format = '#hex6';
- config.beforeBodyEl = [
- '<div class="' + Ext.baseCSSPrefix + 'colorpicker-field-swatch custom-color-picker-swatch">' +
- '<div id="{id}-swatchEl" data-ref="swatchEl" class="' + Ext.baseCSSPrefix +
- 'colorpicker-field-swatch-inner"></div>' +
- '</div>'
- ];
+ config.xtype = 'customcolorpicker';
} else {
config.xtype = 'textfield';
}