kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Satisfy eslint

Browse source
This commit is contained in:
Douwe Maan 2017-04-20 17:56:24 -05:00
parent 36e7b322a7
commit cc3e488c98
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/assets/javascripts/blob/viewer/index.js
View file

@ -1,4 +1,4 @@
``/* eslint-disable no-new */ /* eslint-disable no-new */
/* global Flash */ /* global Flash */
export default class BlobViewer { export default class BlobViewer {
constructor() { constructor() {
@ -50,7 +50,7 @@ export default class BlobViewer {
if (this.simpleViewer.getAttribute('data-loaded')) { if (this.simpleViewer.getAttribute('data-loaded')) {
this.copySourceBtn.setAttribute('title', 'Copy source to clipboard'); this.copySourceBtn.setAttribute('title', 'Copy source to clipboard');
this.copySourceBtn.classList.remove('disabled'); this.copySourceBtn.classList.remove('disabled');
} else if (this.activeViewer == this.simpleViewer) { } else if (this.activeViewer === this.simpleViewer) {
this.copySourceBtn.setAttribute('title', 'Wait for the source to load to copy it to the clipboard'); this.copySourceBtn.setAttribute('title', 'Wait for the source to load to copy it to the clipboard');
this.copySourceBtn.classList.add('disabled'); this.copySourceBtn.classList.add('disabled');
} else { } else {
@ -61,12 +61,11 @@ export default class BlobViewer {
$(this.copySourceBtn).tooltip('fixTitle'); $(this.copySourceBtn).tooltip('fixTitle');
} }
loadViewer(viewerParam, resolve, reject) { loadViewer(viewerParam) {
const viewer = viewerParam; const viewer = viewerParam;
const url = viewer.getAttribute('data-url'); const url = viewer.getAttribute('data-url');
if (!url || viewer.getAttribute('data-loaded') || viewer.getAttribute('data-loading')) { if (!url || viewer.getAttribute('data-loaded') || viewer.getAttribute('data-loading')) {
if (resolve) resolve();
return; return;
} }
@ -76,9 +75,6 @@ export default class BlobViewer {
url, url,
dataType: 'JSON', dataType: 'JSON',
}) })
.fail(() => {
if (reject) reject();
})
.done((data) => { .done((data) => {
viewer.innerHTML = data.html; viewer.innerHTML = data.html;
$(viewer).syntaxHighlight(); $(viewer).syntaxHighlight();
@ -88,16 +84,14 @@ export default class BlobViewer {
this.$blobContentHolder.trigger('highlight:line'); this.$blobContentHolder.trigger('highlight:line');
this.toggleCopyButtonState(); this.toggleCopyButtonState();
if (resolve) resolve();
}); });
} }
switchToViewer(name) { switchToViewer(name) {
const newViewer = document.querySelector(`.blob-viewer[data-type='${name}']`); const newViewer = document.querySelector(`.blob-viewer[data-type='${name}']`);
if (this.activeViewer == newViewer) return; if (this.activeViewer === newViewer) return;
const oldButton = document.querySelector('.js-blob-viewer-switcher.active') const oldButton = document.querySelector('.js-blob-viewer-switcher.active');
const newButton = document.querySelector(`.js-blob-viewer-switcher[data-viewer='${name}']`); const newButton = document.querySelector(`.js-blob-viewer-switcher[data-viewer='${name}']`);
const oldViewer = document.querySelector(`.blob-viewer:not([data-type='${name}'])`); const oldViewer = document.querySelector(`.blob-viewer:not([data-type='${name}'])`);
@ -113,18 +107,13 @@ export default class BlobViewer {
if (oldViewer) { if (oldViewer) {
oldViewer.classList.add('hidden'); oldViewer.classList.add('hidden');
} }
newViewer.classList.remove('hidden'); newViewer.classList.remove('hidden');
this.activeViewer = newViewer; this.activeViewer = newViewer;
this.toggleCopyButtonState(); this.toggleCopyButtonState();
return new Promise((resolve, reject) => { this.loadViewer(newViewer);
this.loadViewer(newViewer, resolve, reject);
})
.catch(() => {
new Flash('Error loading file');
});
} }
} }