Merge branch '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image' into 'master'
Add image controls to MR diffs ## What does this MR do? Instantiates `ImageFile` in `Diff` which is instantiated in `MergeRequestTabs`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-12-04_at_11.11.21](/uploads/738c68ad3fa682c1c132421abce7165e/Screen_Shot_2016-12-04_at_11.11.21.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24949 See merge request !7919
This commit is contained in:
commit
f4dde5d564
|
@ -3,7 +3,7 @@
|
|||
this.CommitFile = (function() {
|
||||
function CommitFile(file) {
|
||||
if ($('.image', file).length) {
|
||||
new ImageFile(file);
|
||||
new gl.ImageFile(file);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-use-before-define, prefer-arrow-callback, no-else-return, consistent-return, prefer-template, quotes, one-var, one-var-declaration-per-line, no-unused-vars, no-return-assign, comma-dangle, quote-props, no-unused-expressions, no-sequences, object-shorthand, padded-blocks, max-len */
|
||||
(function() {
|
||||
this.ImageFile = (function() {
|
||||
gl.ImageFile = (function() {
|
||||
var prepareFrames;
|
||||
|
||||
// Width where images must fits in, for 2-up this gets divided by 2
|
||||
|
|
|
@ -5,8 +5,11 @@
|
|||
|
||||
class Diff {
|
||||
constructor() {
|
||||
$('.files .diff-file').singleFileDiff();
|
||||
$('.files .diff-file').filesCommentButton();
|
||||
const $diffFile = $('.files .diff-file');
|
||||
$diffFile.singleFileDiff();
|
||||
$diffFile.filesCommentButton();
|
||||
|
||||
$diffFile.each((index, file) => new gl.ImageFile(file));
|
||||
|
||||
if (this.diffViewType() === 'parallel') {
|
||||
$('.content-wrapper .container-fluid').removeClass('container-limited');
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Add image controls to MR diffs
|
||||
merge_request: 7919
|
||||
author:
|
Loading…
Reference in New Issue