From 981391fe090471856a56fcc959dd08afaf6ace9f Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Wed, 2 Feb 2022 11:37:18 +0300
Subject: [PATCH] [PE] Fix focus of position settings in advanced settings

---
 .../main/app/view/ChartSettingsAdvanced.js                  | 6 ++++--
 .../main/app/view/ImageSettingsAdvanced.js                  | 6 ++++--
 .../main/app/view/ShapeSettingsAdvanced.js                  | 6 ++++--
 .../main/app/view/TableSettingsAdvanced.js                  | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js
index fdf71e4f1..ae949444a 100644
--- a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js
@@ -185,7 +185,8 @@ define([    'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
                     { value: 'left', displayValue: this.textTopLeftCorner },
                     { value: 'center', displayValue: this.textCenter }
                 ],
-                editable: false
+                editable: false,
+                takeFocusOnClose: true
             });
 
             this.cmbFromY = new Common.UI.ComboBox({
@@ -197,7 +198,8 @@ define([    'text!presentationeditor/main/app/template/ChartSettingsAdvanced.tem
                     { value: 'left', displayValue: this.textTopLeftCorner },
                     { value: 'center', displayValue: this.textCenter }
                 ],
-                editable: false
+                editable: false,
+                takeFocusOnClose: true
             });
 
             // Alt Text
diff --git a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
index cccaa9eba..cebc6d8e4 100644
--- a/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ImageSettingsAdvanced.js
@@ -188,7 +188,8 @@ define([    'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
                     { value: 'left', displayValue: this.textTopLeftCorner },
                     { value: 'center', displayValue: this.textCenter }
                 ],
-                editable: false
+                editable: false,
+                takeFocusOnClose: true
             });
 
             this.cmbFromY = new Common.UI.ComboBox({
@@ -200,7 +201,8 @@ define([    'text!presentationeditor/main/app/template/ImageSettingsAdvanced.tem
                     { value: 'left', displayValue: this.textTopLeftCorner },
                     { value: 'center', displayValue: this.textCenter }
                 ],
-                editable: false
+                editable: false,
+                takeFocusOnClose: true
             });
 
             // Rotation
diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
index c8db5180d..e26025801 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
@@ -193,7 +193,8 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
                     { value: 'left', displayValue: this.textTopLeftCorner },
                     { value: 'center', displayValue: this.textCenter }
                 ],
-                editable: false
+                editable: false,
+                takeFocusOnClose: true
             });
 
             this.cmbFromY = new Common.UI.ComboBox({
@@ -205,7 +206,8 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
                     { value: 'left', displayValue: this.textTopLeftCorner },
                     { value: 'center', displayValue: this.textCenter }
                 ],
-                editable: false
+                editable: false,
+                takeFocusOnClose: true
             });
 
             // Margins
diff --git a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
index 6a14c31ed..32240d336 100644
--- a/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/TableSettingsAdvanced.js
@@ -190,7 +190,8 @@ define([    'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
                     { value: 'left', displayValue: this.textTopLeftCorner },
                     { value: 'center', displayValue: this.textCenter }
                 ],
-                editable: false
+                editable: false,
+                takeFocusOnClose: true
             });
 
             this.cmbFromY = new Common.UI.ComboBox({
@@ -202,7 +203,8 @@ define([    'text!presentationeditor/main/app/template/TableSettingsAdvanced.tem
                     { value: 'left', displayValue: this.textTopLeftCorner },
                     { value: 'center', displayValue: this.textCenter }
                 ],
-                editable: false
+                editable: false,
+                takeFocusOnClose: true
             });
 
             this._marginsChange = function(field, newValue, oldValue, eOpts, source, property){