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:
authorPhil Hughes <me@iamphill.com>2018-08-02 15:47:23 +0300
committerPhil Hughes <me@iamphill.com>2018-08-02 15:47:23 +0300
commit9e5bc599688950e4c1d2c65358fe780b77dff863 (patch)
tree56c817bf900a04e6beac0fd1bbbe687acad5f6b7
parentd4eeee2ad393ef54faecae17fe09789b887bd08b (diff)
Fixed Web IDE row dropdowns scrolling list incorrectly
Closes #49892
-rw-r--r--app/assets/javascripts/ide/components/new_dropdown/index.vue4
-rw-r--r--spec/javascripts/ide/components/new_dropdown/index_spec.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue
index 440e480d596..8eddfa5e455 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
@@ -35,7 +35,9 @@ export default {
watch: {
dropdownOpen() {
this.$nextTick(() => {
- this.$refs.dropdownMenu.scrollIntoView();
+ this.$refs.dropdownMenu.scrollIntoView({
+ block: 'nearest',
+ });
});
},
mouseOver() {
diff --git a/spec/javascripts/ide/components/new_dropdown/index_spec.js b/spec/javascripts/ide/components/new_dropdown/index_spec.js
index 092c405a70b..5cb8b177fc9 100644
--- a/spec/javascripts/ide/components/new_dropdown/index_spec.js
+++ b/spec/javascripts/ide/components/new_dropdown/index_spec.js
@@ -62,7 +62,9 @@ describe('new dropdown component', () => {
vm.dropdownOpen = true;
setTimeout(() => {
- expect(vm.$refs.dropdownMenu.scrollIntoView).toHaveBeenCalled();
+ expect(vm.$refs.dropdownMenu.scrollIntoView).toHaveBeenCalledWith({
+ block: 'nearest',
+ });
done();
});