diff --git a/lib/AppInfo/Application20.php b/lib/AppInfo/Application20.php index 06b95930a3..9dd4f0eb0f 100644 --- a/lib/AppInfo/Application20.php +++ b/lib/AppInfo/Application20.php @@ -197,6 +197,10 @@ protected function registerCollaborationResources(IProviderManager $resourceMana $resourceManager->registerResourceProvider(ResourceProviderCard::class); $symfonyAdapter->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', static function () { + if (strpos(\OC::$server->getRequest()->getPathInfo(), '/call/') === 0) { + // Talk integration has its own entrypoint which already includes collections handling + return; + } Util::addScript('deck', 'collections'); }); } diff --git a/lib/Listeners/BeforeTemplateRenderedListener.php b/lib/Listeners/BeforeTemplateRenderedListener.php index 3dd91cffe7..b7d653e0b7 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -52,5 +52,9 @@ public function handle(Event $event): void { if (strpos($this->request->getPathInfo(), '/apps/calendar') === 0) { Util::addScript('deck', 'calendar'); } + + if (strpos($this->request->getPathInfo(), '/call/') === 0) { + Util::addScript('deck', 'talk'); + } } } diff --git a/src/CardCreateDialog.vue b/src/CardCreateDialog.vue new file mode 100644 index 0000000000..122cc48389 --- /dev/null +++ b/src/CardCreateDialog.vue @@ -0,0 +1,247 @@ + + +