Commit 3ce36140 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'force-two-up-view' into 'master'

Force two up view

Closes #32613

See merge request gitlab-org/gitlab-ce!14397
parents b3544dfe 71bc619e
...@@ -11,15 +11,23 @@ ...@@ -11,15 +11,23 @@
function ImageFile(file) { function ImageFile(file) {
this.file = file; this.file = file;
this.requestImageInfo($('.two-up.view .frame.deleted img', this.file), (function(_this) { this.requestImageInfo($('.two-up.view .frame.deleted img', this.file), (function(_this) {
// Determine if old and new file has same dimensions, if not show 'two-up' view
return function(deletedWidth, deletedHeight) { return function(deletedWidth, deletedHeight) {
return _this.requestImageInfo($('.two-up.view .frame.added img', _this.file), function(width, height) { return _this.requestImageInfo($('.two-up.view .frame.added img', _this.file), function(width, height) {
if (width === deletedWidth && height === deletedHeight) { _this.initViewModes();
return _this.initViewModes();
} else { // Load two-up view after images are loaded
return _this.initView('two-up'); // so that we can display the correct width and height information
const images = $('.two-up.view img', _this.file);
let loadedCount = 0;
images.on('load', () => {
loadedCount += 1;
if (loadedCount === images.length) {
_this.initView('two-up');
} }
}); });
});
}; };
})(this)); })(this));
} }
......
---
title: Force two up view to load by default for image diffs
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment