From aa2ee9b3472931b00cce7ca5f3b93a7f40adf28c Mon Sep 17 00:00:00 2001
From: Milutin Kristofic <milutin@google.com>
Date: Thu, 5 Sep 2019 14:20:24 +0200
Subject: [PATCH] Fixing focus on diff preferences

The auto focus was broken when diff preferencies diff were open

Change-Id: Icaf4c86dc3405cce390570f8c1a38e4a3f317845
---
 .../gr-diff-preferences-dialog/gr-diff-preferences-dialog.js  | 4 ++--
 polygerrit-ui/app/elements/shared/gr-select/gr-select.js      | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-preferences-dialog/gr-diff-preferences-dialog.js b/polygerrit-ui/app/elements/diff/gr-diff-preferences-dialog/gr-diff-preferences-dialog.js
index 9a9a6d7745..f6f48b3c7b 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-preferences-dialog/gr-diff-preferences-dialog.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-preferences-dialog/gr-diff-preferences-dialog.js
@@ -34,13 +34,13 @@
 
     getFocusStops() {
       return {
-        start: this.$.contextSelect,
+        start: this.$.diffPreferences.$.contextSelect,
         end: this.$.saveButton,
       };
     },
 
     resetFocus() {
-      this.$.contextSelect.focus();
+      this.$.diffPreferences.$.contextSelect.focus();
     },
 
     _computeHeaderClass(changed) {
diff --git a/polygerrit-ui/app/elements/shared/gr-select/gr-select.js b/polygerrit-ui/app/elements/shared/gr-select/gr-select.js
index 357ab40af8..ecf542f6aa 100644
--- a/polygerrit-ui/app/elements/shared/gr-select/gr-select.js
+++ b/polygerrit-ui/app/elements/shared/gr-select/gr-select.js
@@ -60,6 +60,10 @@
       this.bindValue = this.nativeSelect.value;
     },
 
+    focus() {
+      this.nativeSelect.focus();
+    },
+
     ready() {
       // If not set via the property, set bind-value to the element value.
       if (this.bindValue == undefined) {