summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/diff.js
diff options
context:
space:
mode:
authorIllya Klymov <xanf@xanf.me>2019-09-10 13:17:25 +0300
committerIllya Klymov <xanf@xanf.me>2019-09-10 15:53:01 +0300
commit1d73d647b06eb6314bfeaf8b5926a08ff161258a (patch)
tree322a68047265ef3e6f51d8f99f5dd29a4df2dac5 /app/assets/javascripts/diff.js
parent2319892654fb44ea4895dd38795de0f215e49208 (diff)
downloadgitlab-ce-fix-image-spec-recursive.tar.gz
Fix recursive dependency in image_difffix-image-spec-recursive
utilsHelper was requiring ImageDiff and vice-versa forming a loop Break the loop by separating initImageDiff function to separate file
Diffstat (limited to 'app/assets/javascripts/diff.js')
-rw-r--r--app/assets/javascripts/diff.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js
index 245f1a7c558..a343138a9e1 100644
--- a/app/assets/javascripts/diff.js
+++ b/app/assets/javascripts/diff.js
@@ -5,7 +5,7 @@ import { __ } from '~/locale';
import { getLocationHash } from './lib/utils/url_utility';
import FilesCommentButton from './files_comment_button';
import SingleFileDiff from './single_file_diff';
-import imageDiffHelper from './image_diff/helpers/index';
+import initImageDiffHelper from './image_diff/helpers/init_image_diff';
const UNFOLD_COUNT = 20;
let isBound = false;
@@ -28,7 +28,7 @@ export default class Diff {
.first()
.get(0);
const canCreateNote = firstFile && firstFile.hasAttribute('data-can-create-note');
- $diffFile.each((index, file) => imageDiffHelper.initImageDiff(file, canCreateNote));
+ $diffFile.each((index, file) => initImageDiffHelper.initImageDiff(file, canCreateNote));
if (!isBound) {
$(document)