diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 09:50:52 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-11 09:50:52 +0000 |
commit | fb47f2a7459f4c413f3fe496bcdb1b40d81d73a4 (patch) | |
tree | 98daa9da72b6da532057e686fc4d191ddf0e1f6c /app | |
parent | cb63a754a4a7e4308310f646e88a6e2352856092 (diff) | |
parent | 24a9983df03a19bf61e03ee8e29aea97e72efc25 (diff) | |
download | gitlab-ce-fb47f2a7459f4c413f3fe496bcdb1b40d81d73a4.tar.gz |
Merge branch 'fix-image-view-mode' into 'master'
Fix image view mode
Closes #40945
See merge request gitlab-org/gitlab-ce!15803
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/commit/image_file.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/commit/image_file.js b/app/assets/javascripts/commit/image_file.js index 50d0cb5c86d..5662802525e 100644 --- a/app/assets/javascripts/commit/image_file.js +++ b/app/assets/javascripts/commit/image_file.js @@ -121,7 +121,7 @@ export default class ImageFile { return $('.swipe.view', this.file).each((function(_this) { return function(index, view) { var $swipeWrap, $swipeBar, $swipeFrame, wrapPadding, ref; - ref = this.prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1]; + ref = _this.prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1]; $swipeFrame = $('.swipe-frame', view); $swipeWrap = $('.swipe-wrap', view); $swipeBar = $('.swipe-bar', view); @@ -158,7 +158,7 @@ export default class ImageFile { return $('.onion-skin.view', this.file).each((function(_this) { return function(index, view) { var $frame, $track, $dragger, $frameAdded, framePadding, ref, dragging = false; - ref = this.prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1]; + ref = _this.prepareFrames(view), maxWidth = ref[0], maxHeight = ref[1]; $frame = $('.onion-skin-frame', view); $frameAdded = $('.frame.added', view); $track = $('.drag-track', view); |