diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-11 19:52:15 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-11 19:52:15 +0200 |
| commit | dc4d6f03ef835d6b69613def9c53a60d3d4c31e9 (patch) | |
| tree | dcda86d91d0c88de396395c998167b3100695cfb | |
| parent | 7fb7f13717254d42e7407d6f30a61e087985d86d (diff) | |
| download | gitlab-ce-dc4d6f03ef835d6b69613def9c53a60d3d4c31e9.tar.gz | |
Fixed tests + Linting errors
3 files changed, 4 insertions, 12 deletions
diff --git a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue index 947d3b9fa6e..d714ceb3a2f 100644 --- a/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/onion_skin_viewer.vue @@ -51,7 +51,8 @@ export default { dragMove(e) { if (!this.dragging) return; const left = e.pageX - this.$refs.dragTrack.getBoundingClientRect().left; - const dragTrackWidth = this.$refs.dragTrack.clientWidth - this.$refs.dragger.clientWidth; + const dragTrackWidth = + this.$refs.dragTrack.clientWidth - this.$refs.dragger.clientWidth || 100; let leftValue = left; if (leftValue < 0) leftValue = 0; diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 7c84056d111..fbc97ec0c95 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -412,7 +412,7 @@ .diff-file-container { .frame.deleted { - border: none; + border: 0; background-color: inherit; .image_file img { @@ -421,7 +421,7 @@ } .frame.added { - border: none; + border: 0; background-color: inherit; .image_file img { diff --git a/spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js b/spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js index f0c5337f504..7d964720ea9 100644 --- a/spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js +++ b/spec/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js @@ -155,15 +155,6 @@ describe('ImageDiffViewer', () => { }); }); - it('switches to Swipe Mode', done => { - vm.$el.querySelector('.view-modes-menu li:nth-child(2)').click(); - - vm.$nextTick(() => { - expect(vm.$el.querySelector('.view-modes-menu li.active').textContent.trim()).toBe('Swipe'); - done(); - }); - }); - it('switches to Onion Skin Mode', done => { vm.$el.querySelector('.view-modes-menu li:nth-child(3)').click(); |