diff --git a/lib/AppInfo/Application20.php b/lib/AppInfo/Application20.php index 06b95930a..9dd4f0eb0 100644 --- a/lib/AppInfo/Application20.php +++ b/lib/AppInfo/Application20.php @@ -197,6 +197,10 @@ class Application20 extends App implements IBootstrap { $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 3dd91cffe..b7d653e0b 100644 --- a/lib/Listeners/BeforeTemplateRenderedListener.php +++ b/lib/Listeners/BeforeTemplateRenderedListener.php @@ -52,5 +52,9 @@ class BeforeTemplateRenderedListener implements IEventListener { 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 000000000..122cc4838 --- /dev/null +++ b/src/CardCreateDialog.vue @@ -0,0 +1,247 @@ + + +