Merge pull request #3818 from nextcloud/enh/collaboration-event

Move to OCP\Collaboration\Resources\LoadAdditionalScriptsEvent
nextcloud · Jul 7, 2022 · bebd157 · bebd157
2 parents 02a6fa7 + 9e26af6
commit bebd157
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -29,6 +29,7 @@
 use OCA\Files\Event\LoadSidebar;
 use OCA\Viewer\Event\LoadViewer;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\Collaboration\Resources\LoadAdditionalScriptsEvent as CollaborationResourcesEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IConfig;
 use OCP\IInitialStateService;
@@ -88,6 +89,7 @@ public function index() {
 		$this->initialState->provideInitialState(Application::APP_ID, 'config', $this->configService->getAll());
 
 		$this->eventDispatcher->dispatchTyped(new LoadSidebar());
+		$this->eventDispatcher->dispatchTyped(new CollaborationResourcesEvent());
 		if (class_exists(LoadViewer::class)) {
 			$this->eventDispatcher->dispatchTyped(new LoadViewer());
 		}

diff --git a/templates/main.php b/templates/main.php
@@ -24,6 +24,3 @@
 
 OCP\Util::addStyle('deck', 'globalstyles');
 OCP\Util::addScript('deck', 'deck-main');
-
-\OCP\Server::get(\OC\EventDispatcher\SymfonyAdapter::class)
-	->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts');