diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-08-29 21:43:45 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-08-29 21:43:45 +0300 |
| commit | ce7cbdcbe5f4c202e1c545ba2f083c01f197949e (patch) | |
| tree | 563be4a4bb5bd2144c76335c48cd32f1962e16c1 | |
| parent | 921d4f37230c8d6d5c097929520bed51e3679a0c (diff) | |
| parent | 88cf7591c7bc38b7dbd70085ea3b93813acc14f8 (diff) | |
Merge branch 'fix-dropdown-closing' into 'master'
Fix dropdown closing when mouseup is outside
See merge request gitlab-org/gitlab-ce!32084
| -rw-r--r-- | app/assets/javascripts/droplab/drop_lab.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-dropdown-closing.yml | 5 | ||||
| -rw-r--r-- | spec/support/features/discussion_comments_shared_example.rb | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/droplab/drop_lab.js b/app/assets/javascripts/droplab/drop_lab.js index 1339e28d8b8..33c05404493 100644 --- a/app/assets/javascripts/droplab/drop_lab.js +++ b/app/assets/javascripts/droplab/drop_lab.js @@ -60,7 +60,7 @@ class DropLab { addEvents() { this.eventWrapper.documentClicked = this.documentClicked.bind(this); - document.addEventListener('click', this.eventWrapper.documentClicked); + document.addEventListener('mousedown', this.eventWrapper.documentClicked); } documentClicked(e) { @@ -74,7 +74,7 @@ class DropLab { } removeEvents() { - document.removeEventListener('click', this.eventWrapper.documentClicked); + document.removeEventListener('mousedown', this.eventWrapper.documentClicked); } changeHookList(trigger, list, plugins, config) { diff --git a/changelogs/unreleased/fix-dropdown-closing.yml b/changelogs/unreleased/fix-dropdown-closing.yml new file mode 100644 index 00000000000..5ce3a6b478e --- /dev/null +++ b/changelogs/unreleased/fix-dropdown-closing.yml @@ -0,0 +1,5 @@ +--- +title: Fix dropdowns closing when click is released outside the dropdown +merge_request: 32084 +author: +type: fixed diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb index 5590bf0fb7e..f070243f111 100644 --- a/spec/support/features/discussion_comments_shared_example.rb +++ b/spec/support/features/discussion_comments_shared_example.rb @@ -73,7 +73,7 @@ shared_examples 'thread comments' do |resource_name| expect(page).not_to have_selector menu_selector find(toggle_selector).click - execute_script("document.querySelector('body').click()") + find("#{form_selector} .note-textarea").click expect(page).not_to have_selector menu_selector end |