Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-10 03:13:05 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-10 03:13:05 +0300
commit1b47b087e6c36f8dc38162d7712f01173c7b85cf (patch)
tree425c32d6068a1f5742db8227cb53d3206393dfae /app/assets/javascripts/behaviors
parent85e524e496ae52652c541e98d5837b7c04bd2607 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/behaviors')
-rw-r--r--app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js
index e4e04123ebc..e58c51104c5 100644
--- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js
+++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js
@@ -118,7 +118,10 @@ export default class ShortcutsIssuable extends Shortcuts {
// Wait for the sidebar to trigger('click') open
// so it doesn't cause our dropdown to close preemptively
setTimeout(() => {
- document.querySelector(`.block.${name} .shortcut-sidebar-dropdown-toggle`).click();
+ const editBtn =
+ document.querySelector(`.block.${name} .shortcut-sidebar-dropdown-toggle`) ||
+ document.querySelector(`.block.${name} .edit-link`);
+ editBtn.click();
}, DEBOUNCE_DROPDOWN_DELAY);
return false;
}