Merge pull request #126 from nextcloud/enh/loading

2 files changed, 16 insertions, 1 deletions

diff --git a/lib/Listener/BeforeLoggedInTemplateRenderedListener.php b/lib/Listener/BeforeLoggedInTemplateRenderedListener.php
index c38325a..713c0c8 100644
--- a/lib/Listener/BeforeLoggedInTemplateRenderedListener.php
+++ b/lib/Listener/BeforeLoggedInTemplateRenderedListener.php
@@ -26,14 +26,21 @@ declare(strict_types=1);
 
 namespace OCA\FilesRightClick\Listener;
 
+use OC\TemplateLayout;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
 class BeforeLoggedInTemplateRenderedListener implements IEventListener {
 	public function handle(Event $event): void {
-		if (!$event instanceof BeforeTemplateRenderedEvent || !$event->isLoggedIn()) {
+		$renderAs = $event->getResponse()->getRenderAs();
+		if (!$event instanceof BeforeTemplateRenderedEvent
+			|| !$event->isLoggedIn()
+			|| $renderAs === TemplateResponse::RENDER_AS_BLANK
+			|| $renderAs === TemplateResponse::RENDER_AS_BASE
+		) {
 			return;
 		}
 
diff --git a/lib/Listener/BeforeTemplateRenderedListener.php b/lib/Listener/BeforeTemplateRenderedListener.php
index 1ade87d..73f425f 100644
--- a/lib/Listener/BeforeTemplateRenderedListener.php
+++ b/lib/Listener/BeforeTemplateRenderedListener.php
@@ -26,12 +26,20 @@ declare(strict_types=1);
 
 namespace OCA\FilesRightClick\Listener;
 
+use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\Util;
 
 class BeforeTemplateRenderedListener implements IEventListener {
 	public function handle(Event $event): void {
+		if ($event instanceof BeforeTemplateRenderedEvent &&
+			($event->getResponse()->getRenderAs() === TemplateResponse::RENDER_AS_BLANK
+				|| $event->getResponse()->getRenderAs() === TemplateResponse::RENDER_AS_BASE)
+		) {
+			return;
+		}
 		Util::addScript('files_rightclick', 'script');
 		Util::addScript('files_rightclick', 'files');
 		Util::addStyle('files_rightclick', 'app');