From 94fc6862c6635c680afc600a19f61fb9aaefe0ef Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 4 Apr 2017 19:39:34 +0500
Subject: Use simple color picker instead of ux

---
 web/app/view/dialog/Attribute.js           | 3 ++-
 web/app/view/dialog/AttributeController.js | 9 +--------
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'web/app/view/dialog')

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';
             }
-- 
cgit v1.2.3