summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/gl_dropdown.js2
-rw-r--r--app/assets/javascripts/repo/index.js10
-rw-r--r--app/assets/javascripts/repo/repo_binary_viewer.vue2
-rw-r--r--app/assets/javascripts/repo/repo_commit_section.vue1
-rw-r--r--app/assets/javascripts/repo/repo_editor.vue7
-rw-r--r--app/assets/javascripts/repo/repo_store.js7
-rw-r--r--spec/javascripts/repo/repo_commit_section_spec.js4
7 files changed, 17 insertions, 16 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js
index 8ef75742e0a..1381ca35aef 100644
--- a/app/assets/javascripts/gl_dropdown.js
+++ b/app/assets/javascripts/gl_dropdown.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func, no-mixed-operators */
+/* eslint-disable func-names, no-underscore-dangle, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func, no-mixed-operators */
/* global fuzzaldrinPlus */
import { isObject } from './lib/utils/type_utility';
diff --git a/app/assets/javascripts/repo/index.js b/app/assets/javascripts/repo/index.js
index 6b6fb4eeec1..6fb342e94d6 100644
--- a/app/assets/javascripts/repo/index.js
+++ b/app/assets/javascripts/repo/index.js
@@ -37,14 +37,12 @@ function addEventsForNonVueEls() {
Store.targetBranch = $('.project-refs-target-form input[name="ref"]').val();
});
- window.onbeforeunload = function (e) {
+ window.onbeforeunload = function confirmUnload(e) {
const hasChanged = Store.openedFiles
.some(file => file.changed);
- if (!hasChanged) return;
- e = e || window.event;
- if (e) {
- e.returnValue = 'Are you sure you want to lose unsaved changes?';
- }
+ if (!hasChanged) return undefined;
+ const event = e || window.event;
+ if (event) event.returnValue = 'Are you sure you want to lose unsaved changes?';
// For Safari
return 'Are you sure you want to lose unsaved changes?';
};
diff --git a/app/assets/javascripts/repo/repo_binary_viewer.vue b/app/assets/javascripts/repo/repo_binary_viewer.vue
index 49f8896fa5b..cc26b49e794 100644
--- a/app/assets/javascripts/repo/repo_binary_viewer.vue
+++ b/app/assets/javascripts/repo/repo_binary_viewer.vue
@@ -31,7 +31,7 @@ const RepoBinaryViewer = {
},
getBinaryType() {
- if (this.binaryTypes.hasOwnProperty(this.activeFile.extension)) {
+ if (Object.hasOwnProperty.call(this.binaryTypes, this.activeFile.extension)) {
return this.activeFile.extension;
}
return 'unknown';
diff --git a/app/assets/javascripts/repo/repo_commit_section.vue b/app/assets/javascripts/repo/repo_commit_section.vue
index 68a51680b76..e8681e21c92 100644
--- a/app/assets/javascripts/repo/repo_commit_section.vue
+++ b/app/assets/javascripts/repo/repo_commit_section.vue
@@ -27,7 +27,6 @@ const RepoCommitSection = {
const branch = Helper.getBranch();
const commitMessage = this.commitMessage;
const actions = this.changedFiles.map((f) => {
- const filePath = Helper.getFilePathFromFullPath(f.url, branch);
return {
action: 'update',
file_path: Helper.getFilePathFromFullPath(f.url, branch),
diff --git a/app/assets/javascripts/repo/repo_editor.vue b/app/assets/javascripts/repo/repo_editor.vue
index 1692d2a6427..1c6bce7c6ce 100644
--- a/app/assets/javascripts/repo/repo_editor.vue
+++ b/app/assets/javascripts/repo/repo_editor.vue
@@ -89,13 +89,16 @@ const RepoEditor = {
dialog: {
handler(obj) {
if (obj.status) {
- obj.status = false;
- this.openedFiles.map((f) => {
+ obj.status = false; // eslint-disable-line no-param-reassign
+ this.openedFiles.map((file) => {
+ const f = file;
if (f.active) {
this.blobRaw = f.plain;
}
f.changed = false;
delete f.newContent;
+
+ return f;
});
this.editMode = false;
}
diff --git a/app/assets/javascripts/repo/repo_store.js b/app/assets/javascripts/repo/repo_store.js
index a0c28d0205a..ee47c4be5ad 100644
--- a/app/assets/javascripts/repo/repo_store.js
+++ b/app/assets/javascripts/repo/repo_store.js
@@ -59,10 +59,9 @@ const RepoStore = {
readOnly: true,
resetBinaryTypes() {
- let s = '';
- for (s in RepoStore.binaryTypes) {
- RepoStore.binaryTypes[s] = false;
- }
+ Object.keys(RepoStore.binaryTypes).forEach((key) => {
+ RepoStore.binaryTypes[key] = false;
+ });
},
// mutations
diff --git a/spec/javascripts/repo/repo_commit_section_spec.js b/spec/javascripts/repo/repo_commit_section_spec.js
index b00342034f4..e5ffcb8a4ee 100644
--- a/spec/javascripts/repo/repo_commit_section_spec.js
+++ b/spec/javascripts/repo/repo_commit_section_spec.js
@@ -42,7 +42,9 @@ describe('RepoCommitSection', () => {
expect(changedFiles.length).toEqual(2);
changedFiles.forEach((changedFile, i) => {
- expect(changedFile.textContent).toEqual(RepoHelper.getFilePathFromFullPath(openedFiles[i].url, branch));
+ const filePath = RepoHelper.getFilePathFromFullPath(openedFiles[i].url, branch);
+
+ expect(changedFile.textContent).toEqual(filePath);
});
expect(commitMessage.tagName).toEqual('TEXTAREA');