From 0cfb1ea7a76c5415d34a7a41258a2fa27163e7fe Mon Sep 17 00:00:00 2001 From: patrick Date: Sun, 14 Mar 2021 10:48:32 +0100 Subject: Removed support for nc 20. --- .eslintrc.js | 22 +++---- appinfo/info.xml | 4 +- src/main.ts | 69 +++++++++---------- src/views/ChecksumTab.vue | 5 +- src/views/ChecksumTab20.vue | 157 -------------------------------------------- 5 files changed, 46 insertions(+), 211 deletions(-) delete mode 100644 src/views/ChecksumTab20.vue diff --git a/.eslintrc.js b/.eslintrc.js index aeb49d4..8e9eb78 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,12 +1,12 @@ module.exports = { - extends: [ - '@nextcloud' - ], - settings: { - 'import/resolver': { - 'node': { - 'extensions': ['.js', '.ts', 'vue'] - } - } - } -}; + extends: [ + '@nextcloud', + ], + settings: { + 'import/resolver': { + node: { + extensions: ['.js', '.ts', 'vue'], + }, + }, + }, +} diff --git a/appinfo/info.xml b/appinfo/info.xml index 6df22e4..25bec86 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -12,7 +12,7 @@ Select a algorithm and it will try to generate a hash. If you want an other algorithm, just click on the reload button. - 1.1.2 + 1.2.0 agpl westberliner @@ -29,6 +29,6 @@ https://raw.githubusercontent.com/westberliner/checksum/master/screenshots/checksum.gif - + diff --git a/src/main.ts b/src/main.ts index 0de694c..7d408b0 100644 --- a/src/main.ts +++ b/src/main.ts @@ -20,6 +20,7 @@ * */ + /// declare var OC: Nextcloud.v20.OC @@ -28,50 +29,40 @@ declare var OCA: Checksum.OCA import Vue from 'vue' import { translate as t } from '@nextcloud/l10n' -// @ts-ignore -import ChecksumTab20 from './views/ChecksumTab20' -// @ts-ignore -import ChecksumTab from './views/ChecksumTab' +import ChecksumTab from './views/ChecksumTab.vue' -// Init Sharing tab component -const View = Vue.extend(ChecksumTab) -let tabInstance: Checksum.VueElement | null = null; +let tabInstance: Checksum.VueElement | null = null window.addEventListener('DOMContentLoaded', function() { if (OCA.Files && OCA.Files.Sidebar) { - let checksumTab - if (OC.config.version < '21') { - checksumTab = new OCA.Files.Sidebar.Tab('checksum', ChecksumTab20) - } else { - checksumTab = new OCA.Files.Sidebar.Tab({ - id: 'checksum', - name: t('checksum', 'Checksum'), - icon: 'icon-category-auth', + const checksumTab = new OCA.Files.Sidebar.Tab({ + id: 'checksum', + name: t('checksum', 'Checksum'), + icon: 'icon-category-auth', - mount(el: HTMLElement, fileInfo: Checksum.FileInfo, context: any) { - if (tabInstance) { - tabInstance.$destroy() - } - tabInstance = new View({ - // Better integration with vue parent component - parent: context, - }) - // Only mount after we have all the info we need - tabInstance.update(fileInfo) - tabInstance.$mount(el) - }, - update(fileInfo: Checksum.FileInfo) { - tabInstance?.update(fileInfo) - }, - destroy() { - tabInstance?.$destroy() - tabInstance = null - }, - enabled(fileInfo: Checksum.FileInfo): boolean { - return (fileInfo.type === 'file') - }, - }) - } + mount(el: HTMLElement, fileInfo: Checksum.FileInfo, context: any) { + if (tabInstance) { + tabInstance.$destroy() + } + tabInstance = new ChecksumTab({ + // Better integration with vue parent component + parent: context, + }) + // Only mount after we have all the info we need + tabInstance.update(fileInfo) + tabInstance.$mount(el) + }, + update(fileInfo: Checksum.FileInfo) { + tabInstance?.update(fileInfo) + }, + destroy() { + tabInstance?.$destroy() + tabInstance = null + }, + enabled(fileInfo: Checksum.FileInfo): boolean { + return (fileInfo.type === 'file') + }, + }) OCA.Files.Sidebar.registerTab(checksumTab) } }) diff --git a/src/views/ChecksumTab.vue b/src/views/ChecksumTab.vue index 42de059..9b800f5 100644 --- a/src/views/ChecksumTab.vue +++ b/src/views/ChecksumTab.vue @@ -37,12 +37,13 @@ -- cgit v1.2.3