From bb27d1f9dda35eebcff3101fb14b38acf8e0736b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 28 Oct 2019 12:04:02 +0100 Subject: Adjust to new eslint rules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/EditorFactory.js | 2 +- src/components/EditorWrapper.vue | 10 +++++----- src/components/MenuBar.vue | 6 +++--- src/components/SessionList.vue | 4 ++-- src/files.js | 1 - src/helpers/files.js | 4 ++-- src/nodes/ImageView.vue | 10 +++++----- src/services/PollingBackend.js | 6 +++--- src/services/SyncService.js | 6 +++--- 9 files changed, 24 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/EditorFactory.js b/src/EditorFactory.js index 4d43f3015..87a120e8f 100644 --- a/src/EditorFactory.js +++ b/src/EditorFactory.js @@ -43,7 +43,7 @@ import { MarkdownSerializer, defaultMarkdownSerializer } from 'prosemirror-markd const loadSyntaxHighlight = async(language) => { const languages = [language] - let modules = {} + const modules = {} for (let i = 0; i < languages.length; i++) { try { const lang = await import(/* webpackChunkName: "highlight/[request]" */'highlight.js/lib/languages/' + languages[i]) diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue index f5181101f..e3395fb14 100644 --- a/src/components/EditorWrapper.vue +++ b/src/components/EditorWrapper.vue @@ -399,17 +399,17 @@ export default { updateSessions(sessions) { this.sessions = sessions.sort((a, b) => b.lastContact - a.lastContact) - let currentSessionIds = this.sessions.map((session) => session.userId) - let currentGuestIds = this.sessions.map((session) => session.guestId) + const currentSessionIds = this.sessions.map((session) => session.userId) + const currentGuestIds = this.sessions.map((session) => session.guestId) const removedSessions = Object.keys(this.filteredSessions) .filter(sessionId => !currentSessionIds.includes(sessionId) && !currentGuestIds.includes(sessionId)) - for (let index in removedSessions) { + for (const index in removedSessions) { Vue.delete(this.filteredSessions, removedSessions[index]) } - for (let index in this.sessions) { - let session = this.sessions[index] + for (const index in this.sessions) { + const session = this.sessions[index] const sessionKey = session.displayName ? session.userId : session.id if (this.filteredSessions[sessionKey]) { // update timestamp if relevant diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue index bbf8db126..d8df94393 100644 --- a/src/components/MenuBar.vue +++ b/src/components/MenuBar.vue @@ -123,7 +123,7 @@ export default { }, getIconClasses() { return (isActive, icon) => { - let classes = { + const classes = { 'is-active': icon.isActive(isActive) } classes[icon.class] = true @@ -151,7 +151,7 @@ export default { }, childPopoverMenu() { return (isActive, commands, icons, parent) => { - let popoverMenuItems = [] + const popoverMenuItems = [] for (const index in icons) { popoverMenuItems.push({ text: icons[index].label, @@ -169,7 +169,7 @@ export default { childIconClass() { return (isActive, icons) => { for (const index in icons) { - var icon = icons[index] + const icon = icons[index] if (icon.isActive(isActive)) { return icon.class } diff --git a/src/components/SessionList.vue b/src/components/SessionList.vue index c2d97605e..67ca08d8a 100644 --- a/src/components/SessionList.vue +++ b/src/components/SessionList.vue @@ -70,8 +70,8 @@ export default { computed: { editorsTooltip() { if (this.sessionsPopover.length > 0) { - let first = this.activeSessions.slice(0, 3).map((session) => session.guestName ? session.guestName : session.displayName).join(', ') - let others = this.activeSessions.slice(3).length + const first = this.activeSessions.slice(0, 3).map((session) => session.guestName ? session.guestName : session.displayName).join(', ') + const others = this.activeSessions.slice(3).length return first + ' ' + n('text', 'and %n other editor', 'and %n other editors', others) } return this.activeSessions.slice(0, 3).map((session) => session.guestName ? session.guestName : session.displayName).join(', ') diff --git a/src/files.js b/src/files.js index b5a0159b3..b2bab8c1b 100644 --- a/src/files.js +++ b/src/files.js @@ -22,7 +22,6 @@ import FilesEditor from './components/FilesEditor' import PreviewPlugin from './files/PreviewPlugin' -import RichWorkspace from './views/RichWorkspace' import { registerFileActionFallback, registerFileCreate, FilesWorkspacePlugin } from './helpers/files' import { openMimetypesMarkdown, openMimetypesPlainText } from './helpers/mime' diff --git a/src/helpers/files.js b/src/helpers/files.js index b4993fd95..d8d3f31cb 100644 --- a/src/helpers/files.js +++ b/src/helpers/files.js @@ -75,7 +75,7 @@ const fetchFileInfo = async function(user, path) { const registerFileCreate = () => { const newFileMenuPlugin = { attach: function(menu) { - var fileList = menu.fileList + const fileList = menu.fileList // only attach to main file list, public view is not supported yet if (fileList.id !== 'files' && fileList.id !== 'files.public') { @@ -91,7 +91,7 @@ const registerFileCreate = () => { fileType: 'file', actionHandler: function(name) { fileList.createFile(name).then(function(status, data) { - let fileInfoModel = new OCA.Files.FileInfoModel(data) + const fileInfoModel = new OCA.Files.FileInfoModel(data) if (typeof OCA.Viewer !== 'undefined') { OCA.Files.fileActions.triggerAction('view', fileInfoModel, fileList) } else if (typeof OCA.Viewer === 'undefined') { diff --git a/src/nodes/ImageView.vue b/src/nodes/ImageView.vue index c51ac0380..84e9151bc 100644 --- a/src/nodes/ImageView.vue +++ b/src/nodes/ImageView.vue @@ -70,16 +70,16 @@ const imageMimes = [ ] const getQueryVariable = (src, variable) => { - var query = src.split('#')[1] + const query = src.split('#')[1] if (typeof query === 'undefined') { return } - var vars = query.split('&') + const vars = query.split('&') if (typeof vars === 'undefined') { return } - for (var i = 0; i < vars.length; i++) { - var pair = vars[i].split('=') + for (let i = 0; i < vars.length; i++) { + const pair = vars[i].split('=') if (decodeURIComponent(pair[0]) === variable) { return decodeURIComponent(pair[1]) } @@ -149,7 +149,7 @@ export default { this.loaded = true return } - var img = new Image() + const img = new Image() img.src = this.node.attrs.src img.onload = () => { this.imageLoaded = true diff --git a/src/services/PollingBackend.js b/src/services/PollingBackend.js index 9101e3ded..09cfc728f 100644 --- a/src/services/PollingBackend.js +++ b/src/services/PollingBackend.js @@ -175,8 +175,8 @@ class PollingBackend { return } this.lock = true - let sendable = (typeof _sendable === 'function') ? _sendable() : _sendable - let steps = sendable.steps + const sendable = (typeof _sendable === 'function') ? _sendable() : _sendable + const steps = sendable.steps axios.post(endpointUrl('session/push', !!this._authority.options.shareToken), { documentId: this._authority.document.id, sessionId: this._authority.session.id, @@ -240,7 +240,7 @@ class PollingBackend { } carefulRetry() { - let newRetry = this.retryTime ? Math.min(this.retryTime * 2, MAX_PUSH_RETRY) : MIN_PUSH_RETRY + const newRetry = this.retryTime ? Math.min(this.retryTime * 2, MAX_PUSH_RETRY) : MIN_PUSH_RETRY if (newRetry > WARNING_PUSH_RETRY && this.retryTime < WARNING_PUSH_RETRY) { OC.Notification.showTemporary('Changes could not be sent yet') this._authority.emit('error', ERROR_TYPE.PUSH_FAILURE, {}) diff --git a/src/services/SyncService.js b/src/services/SyncService.js index cc63e980d..1e6233eca 100644 --- a/src/services/SyncService.js +++ b/src/services/SyncService.js @@ -166,7 +166,7 @@ class SyncService { } sendSteps(_sendable) { - let sendable = _sendable || sendableSteps(this.state) + const sendable = _sendable || sendableSteps(this.state) if (!sendable) { return } @@ -181,9 +181,9 @@ class SyncService { } _receiveSteps({ steps, document }) { - let newSteps = [] + const newSteps = [] for (let i = 0; i < steps.length; i++) { - let singleSteps = steps[i].data + const singleSteps = steps[i].data if (!Array.isArray(singleSteps)) { console.error('Invalid step data, skipping step', steps[i]) // TODO: recover -- cgit v1.2.3