Commit 6239bf72 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch '27899-fix-diff-view-comment-form-placement' into 'master'

Get view type based on diff_view Cookie

Closes #27899

See merge request !9821
parents 47cef41e cd0825f6
/* eslint-disable no-restricted-properties, func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-use-before-define, camelcase, no-unused-expressions, quotes, max-len, one-var, one-var-declaration-per-line, default-case, prefer-template, consistent-return, no-alert, no-return-assign, no-param-reassign, prefer-arrow-callback, no-else-return, comma-dangle, no-new, brace-style, no-lonely-if, vars-on-top, no-unused-vars, no-sequences, no-shadow, newline-per-chained-call, no-useless-escape */ /* eslint-disable no-restricted-properties, func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-use-before-define, camelcase, no-unused-expressions, quotes, max-len, one-var, one-var-declaration-per-line, default-case, prefer-template, consistent-return, no-alert, no-return-assign, no-param-reassign, prefer-arrow-callback, no-else-return, comma-dangle, no-new, brace-style, no-lonely-if, vars-on-top, no-unused-vars, no-sequences, no-shadow, newline-per-chained-call, no-useless-escape */
/* global Flash */ /* global Flash */
/* global Autosave */ /* global Autosave */
/* global Cookies */
/* global ResolveService */ /* global ResolveService */
/* global mrRefreshWidgetUrl */ /* global mrRefreshWidgetUrl */
require('./autosave'); require('./autosave');
window.autosize = require('vendor/autosize'); window.autosize = require('vendor/autosize');
window.Dropzone = require('dropzone'); window.Dropzone = require('dropzone');
window.Cookies = require('js-cookie');
require('./dropzone_input'); require('./dropzone_input');
require('./gfm_auto_complete'); require('./gfm_auto_complete');
require('vendor/jquery.caret'); // required by jquery.atwho require('vendor/jquery.caret'); // required by jquery.atwho
...@@ -42,7 +44,6 @@ require('./task_list'); ...@@ -42,7 +44,6 @@ require('./task_list');
this.notes_url = notes_url; this.notes_url = notes_url;
this.note_ids = note_ids; this.note_ids = note_ids;
this.last_fetched_at = last_fetched_at; this.last_fetched_at = last_fetched_at;
this.view = view;
this.noteable_url = document.URL; this.noteable_url = document.URL;
this.notesCountBadge || (this.notesCountBadge = $(".issuable-details").find(".notes-tab .badge")); this.notesCountBadge || (this.notesCountBadge = $(".issuable-details").find(".notes-tab .badge"));
this.basePollingInterval = 15000; this.basePollingInterval = 15000;
...@@ -57,6 +58,7 @@ require('./task_list'); ...@@ -57,6 +58,7 @@ require('./task_list');
selector: '.notes' selector: '.notes'
}); });
this.collapseLongCommitList(); this.collapseLongCommitList();
this.setViewType(view);
// We are in the Merge Requests page so we need another edit form for Changes tab // We are in the Merge Requests page so we need another edit form for Changes tab
if (gl.utils.getPagePath(1) === 'merge_requests') { if (gl.utils.getPagePath(1) === 'merge_requests') {
...@@ -65,6 +67,10 @@ require('./task_list'); ...@@ -65,6 +67,10 @@ require('./task_list');
} }
} }
Notes.prototype.setViewType = function(view) {
this.view = Cookies.get('diff_view') || view;
};
Notes.prototype.addBinding = function() { Notes.prototype.addBinding = function() {
// add note to UI after creation // add note to UI after creation
$(document).on("ajax:success", ".js-main-target-form", this.addNote); $(document).on("ajax:success", ".js-main-target-form", this.addNote);
...@@ -302,7 +308,7 @@ require('./task_list'); ...@@ -302,7 +308,7 @@ require('./task_list');
}; };
Notes.prototype.isParallelView = function() { Notes.prototype.isParallelView = function() {
return this.view === 'parallel'; return Cookies.get('diff_view') === 'parallel';
}; };
/* /*
......
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