diff options
author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2020-03-26 17:06:11 +0300 |
---|---|---|
committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2020-04-20 16:06:47 +0300 |
commit | 1061537667fc37e4a0c0500920cc680fe4af92af (patch) | |
tree | 71e828cb15d9e6cd516fa0c3fc1fc9ed87ccf2dd /src | |
parent | edbb47d0ff845b1fae5edcf81d2e15890609c1e3 (diff) |
Enable Text to be used by Viewer outside Files app
Since Nextcloud 18.0.4 the Files app triggers the "LoadViewer" event, so
that event can be used to register Text with Viewer instead of doing it
through the "OCA\Files::loadAdditionalScripts" event.
Besides being more correct for the Files app it also makes possible to
use Text when opening files through Viewer in other apps, like Talk.
Note, however, that in public share pages Text is still opened using the
fallback actions instead of through Viewer, as Viewer currently does not
provide the share token of the public shared folder that contains the
file to be opened.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/components/ViewerComponent.vue (renamed from src/components/FilesEditor.vue) | 2 | ||||
-rw-r--r-- | src/files.js | 9 | ||||
-rw-r--r-- | src/viewer.js | 41 |
3 files changed, 42 insertions, 10 deletions
diff --git a/src/components/FilesEditor.vue b/src/components/ViewerComponent.vue index 11dbeeaec..952f7b8b3 100644 --- a/src/components/FilesEditor.vue +++ b/src/components/ViewerComponent.vue @@ -30,7 +30,7 @@ <script> export default { - name: 'FilesEditor', + name: 'ViewerComponent', components: { EditorWrapper: () => import(/* webpackChunkName: "editor" */'./EditorWrapper'), }, diff --git a/src/files.js b/src/files.js index 95ab0cc85..d4bf4cce5 100644 --- a/src/files.js +++ b/src/files.js @@ -21,9 +21,7 @@ */ import Vue from 'vue' -import FilesEditor from './components/FilesEditor' import { registerFileActionFallback, registerFileCreate, FilesWorkspacePlugin } from './helpers/files' -import { openMimetypesMarkdown, openMimetypesPlainText } from './helpers/mime' import FilesSettings from './views/FilesSettings' import { loadState } from '@nextcloud/initial-state' @@ -39,13 +37,6 @@ document.addEventListener('DOMContentLoaded', () => { if (typeof OCA.Viewer === 'undefined') { console.error('Viewer app is not installed') registerFileActionFallback() - } else { - OCA.Viewer.registerHandler({ - id: 'text', - mimes: [...openMimetypesMarkdown, ...openMimetypesPlainText], - component: FilesEditor, - group: null, - }) } if (workspaceAvailable && OCA && OCA.Files && OCA.Files.Settings) { diff --git a/src/viewer.js b/src/viewer.js new file mode 100644 index 000000000..3cf67882c --- /dev/null +++ b/src/viewer.js @@ -0,0 +1,41 @@ +/* + * @copyright Copyright (c) 2019 Julius Härtl <jus@bitgrid.net> + * + * @author Julius Härtl <jus@bitgrid.net> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +import ViewerComponent from './components/ViewerComponent' +import { openMimetypesMarkdown, openMimetypesPlainText } from './helpers/mime' + +__webpack_nonce__ = btoa(OC.requestToken) // eslint-disable-line +__webpack_public_path__ = OC.linkTo('text', 'js/') // eslint-disable-line + +document.addEventListener('DOMContentLoaded', () => { + if (typeof OCA.Viewer === 'undefined') { + console.error('Viewer app is not installed') + return + } + + OCA.Viewer.registerHandler({ + id: 'text', + mimes: [...openMimetypesMarkdown, ...openMimetypesPlainText], + component: ViewerComponent, + group: null, + }) +}) |