#856 - Move remaining parts to Joomla extensions

joomlatools · Dec 16, 2021 · f337440 · f337440
1 parent 1303be4
commit f337440
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/code/dispatcher/behavior/decoratable.php b/code/dispatcher/behavior/decoratable.php
@@ -16,32 +16,12 @@ protected function _beforeSend(KDispatcherContextInterface $context)
 
         if(!$response->isDownloadable() && !$response->isRedirect() && $request->getFormat() == 'html')
         {
-            $decorator = $this->getDecorator();
-
-            //Set metadata in Joomla document
-            if($decorator == 'joomla')
-            {
-                //Set the title
-                if($title = $this->getController()->getView()->getTitle()) {
-                    JFactory::getDocument()->setTitle($title);
-                }
-
-                //Set the direction
-                if($direction = $this->getController()->getView()->getDirection()) {
-                    JFactory::getDocument()->setDirection($direction);
-                }
-
-                //Set the language
-                if($language = $this->getController()->getView()->getLanguage()) {
-                    JFactory::getDocument()->setLanguage($language);
-                }
-            }
-
             $controller = $this->getObject('com:koowa.controller.page',  array('response' => $response));
 
             //Configure the page view
             $controller->getView()
-                ->setDecorator($decorator)
+                ->setDecorator($this->getDecorator())
+                ->setDecorator($this->getDecorator())
                 ->setLayout($this->getLayout());
 
             //Set the result in the response

diff --git a/contrib/extensions/joomla/event/subscriber/dispatcher.php b/contrib/extensions/joomla/event/subscriber/dispatcher.php
@@ -114,7 +114,6 @@ public function onAfterApplicationInitialise(KEventInterface $event)
         }
     }
 
-
     public function onAfterApplicationRoute(KEventInterface $event)
     {
         $dispatcher = $this->getDispatcher();
@@ -231,6 +230,29 @@ public function onBeforeDispatcherDispatch(KEventInterface $event)
         }
     }
 
+    public function onBeforeKoowaPageControllerRender(KEventInterface $event)
+    {
+        $dispatcher = $this->getDispatcher();
+
+        if($dispatcher->getDecorator() == 'joomla')
+        {
+            //Set the title
+            if($title = $dispatcher->getController()->getView()->getTitle()) {
+                JFactory::getDocument()->setTitle($title);
+            }
+
+            //Set the direction
+            if($direction = $dispatcher->getController()->getView()->getDirection()) {
+                JFactory::getDocument()->setDirection($direction);
+            }
+
+            //Set the language
+            if($language = $dispatcher->getController()->getView()->getLanguage()) {
+                JFactory::getDocument()->setLanguage($language);
+            }
+        }
+    }
+
     public function onAfterApplicationDispatch(KEventInterface $event)
     {
         if($this->isDispatchable())
@@ -274,6 +296,8 @@ public function onAfterApplicationDispatch(KEventInterface $event)
         }
     }
 
+
+
     public function onAfterApplicationRender(KEventInterface $event)
     {
         if(!headers_sent())