From ec73794b25bc036fd82479df8ab9ec1c302df6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 2 Feb 2021 20:27:05 +0100 Subject: [PATCH] Register talk message action for creating deck cards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/AppInfo/Application20.php | 4 + .../BeforeTemplateRenderedListener.php | 4 + src/CardCreateDialog.vue | 247 ++++++++++++++++++ src/helpers/selector.js | 47 ++++ src/init-collections.js | 57 +--- src/init-talk.js | 62 +++++ webpack.js | 1 + 7 files changed, 372 insertions(+), 50 deletions(-) create mode 100644 src/CardCreateDialog.vue create mode 100644 src/helpers/selector.js create mode 100644 src/init-talk.js 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 @@ 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 3dd91cffe..b7d653e0b 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 000000000..122cc4838 --- /dev/null +++ b/src/CardCreateDialog.vue @@ -0,0 +1,247 @@ + + +