From 91ac033599bd7b0ee0e860a8c07a3298a88a11d5 Mon Sep 17 00:00:00 2001
From: Kasper Nilsson <kaspern@google.com>
Date: Wed, 27 Jun 2018 11:02:36 -0700
Subject: [PATCH] Suppress X keyboard shortcut when relevant

Bug: Issue 9357
Change-Id: I3c0e9af93d20f4c85b31d2babd81c5c739e9a1aa
---
 polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index 9862b3f9aa..8798a8f809 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -990,6 +990,7 @@
     },
 
     _handleShiftXKey(e) {
+      if (this.shouldSuppressKeyboardShortcut(e)) { return; }
       this.$.diff.expandAllContext();
     },
   });