Skip to content

Commit bbd5d6d

Browse files
skjnldsvjuliusknorr
authored andcommitted
fix: move to addInitScript
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
1 parent 1852e11 commit bbd5d6d

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

lib/Listeners/FilesLoadAdditionalScriptsListener.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public function handle(Event $event): void {
4545
return;
4646
}
4747

48+
\OCP\Util::addInitScript('text', 'text-init');
4849
\OCP\Util::addScript('text', 'text-files');
4950

5051
$this->initialStateProvider->provideState();

src/files.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
*/
2222
import { linkTo } from '@nextcloud/router'
2323
import { loadState } from '@nextcloud/initial-state'
24-
import { registerFileListHeaders, registerDavProperty } from '@nextcloud/files'
2524
import Vue from 'vue'
2625

2726
import { logger } from './helpers/logger.js'
28-
import { registerFileActionFallback, FilesWorkspaceHeader } from './helpers/files.js'
27+
import { registerFileActionFallback } from './helpers/files.js'
2928
import FilesSettings from './views/FilesSettings.vue'
3029
import store from './store/index.js'
3130

@@ -35,9 +34,6 @@ __webpack_public_path__ = linkTo('text', 'js/') // eslint-disable-line
3534
const workspaceAvailable = loadState('text', 'workspace_available')
3635
const workspaceEnabled = loadState('text', 'workspace_enabled')
3736

38-
registerDavProperty('nc:rich-workspace', { nc: 'http://nextcloud.org/ns' })
39-
registerDavProperty('nc:rich-workspace-file', { nc: 'http://nextcloud.org/ns' })
40-
4137
document.addEventListener('DOMContentLoaded', () => {
4238
if (typeof OCA.Viewer === 'undefined') {
4339
logger.error('Viewer app is not installed')
@@ -59,9 +55,6 @@ document.addEventListener('DOMContentLoaded', () => {
5955
}
6056

6157
})
62-
if (workspaceAvailable) {
63-
registerFileListHeaders(FilesWorkspaceHeader)
64-
}
6558

6659
OCA.Text = {
6760
RichWorkspaceEnabled: workspaceEnabled,

src/init.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { registerFileListHeaders, registerDavProperty } from '@nextcloud/files'
2+
import { loadState } from '@nextcloud/initial-state'
3+
import { FilesWorkspaceHeader } from './helpers/files.js'
4+
5+
const workspaceAvailable = loadState('text', 'workspace_available')
6+
7+
registerDavProperty('nc:rich-workspace', { nc: 'http://nextcloud.org/ns' })
8+
registerDavProperty('nc:rich-workspace-file', { nc: 'http://nextcloud.org/ns' })
9+
10+
if (workspaceAvailable) {
11+
registerFileListHeaders(FilesWorkspaceHeader)
12+
}

webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ webpackConfig.entry = {
88
public: path.join(__dirname, 'src', 'public.js'),
99
viewer: path.join(__dirname, 'src', 'viewer.js'),
1010
editors: path.join(__dirname, 'src', 'editor.js'),
11+
init: path.join(__dirname, 'src', 'init.js'),
1112
}
1213

1314
webpackConfig.output.chunkFilename = '[id].js?v=[contenthash]'

0 commit comments

Comments
 (0)