From d8a1bd88f520228e21e6dd76e2ec8aeed35a26cf Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 25 Sep 2020 22:05:21 +0300
Subject: [PATCH] Bug 27088: add focus manager to Extended color dialog

---
 apps/common/main/lib/view/ExtendedColorDialog.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/common/main/lib/view/ExtendedColorDialog.js b/apps/common/main/lib/view/ExtendedColorDialog.js
index 2790ee764..112a3bf9f 100644
--- a/apps/common/main/lib/view/ExtendedColorDialog.js
+++ b/apps/common/main/lib/view/ExtendedColorDialog.js
@@ -58,7 +58,8 @@ define([
                 }),
                 header: false,
                 width: 340,
-                height: 272
+                height: 272,
+                focusManager: true
             });
 
             this.hexRe = /\s*#?([0-9a-fA-F][0-9a-fA-F]?)([0-9a-fA-F][0-9a-fA-F]?)([0-9a-fA-F][0-9a-fA-F]?)\s*/;
@@ -85,7 +86,6 @@ define([
                 defaultUnit : "",
                 maxValue: 255,
                 minValue: 0,
-                tabindex: 1,
                 maskExp: /[0-9]/,
                 allowDecimal: false
             });
@@ -98,7 +98,6 @@ define([
                 defaultUnit : "",
                 maxValue: 255,
                 minValue: 0,
-                tabindex: 2,
                 maskExp: /[0-9]/,
                 allowDecimal: false
             });
@@ -111,7 +110,6 @@ define([
                 defaultUnit : "",
                 maxValue: 255,
                 minValue: 0,
-                tabindex: 3,
                 maskExp: /[0-9]/,
                 allowDecimal: false
             });
@@ -128,7 +126,6 @@ define([
             this.spinB.on('change', _.bind(this.showColor, this, null, true)).on('changing', _.bind(this.onChangingRGB, this, 3));
             this.textColor.on('change', _.bind(this.onChangeMaskedField, this));
             this.textColor.on('changed', _.bind(this.onChangedMaskedField, this));
-            this.textColor.$el.attr('tabindex', 4);
             this.spinR.$el.find('input').attr('maxlength', 3);
             this.spinG.$el.find('input').attr('maxlength', 3);
             this.spinB.$el.find('input').attr('maxlength', 3);
@@ -146,6 +143,9 @@ define([
             this.rendered = true;
             if (this.color!==undefined)
                 this.setColor(this.color);
+
+            this.focusManager.add([this.spinR, this.spinG, this.spinB], '.form-control');
+            this.focusManager.add(this.textColor, 'input');
             return this;
         },