From 8fd93b0219831f3df062db54cd2917b72ceb8017 Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Sat, 3 Aug 2024 03:09:34 +0300
Subject: [PATCH] process response form on active connection completed

---
 src/Entity/Browser/Container/Page.php | 66 +++++++++++++--------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/Entity/Browser/Container/Page.php b/src/Entity/Browser/Container/Page.php
index 941171e4..aa5cf3d2 100644
--- a/src/Entity/Browser/Container/Page.php
+++ b/src/Entity/Browser/Container/Page.php
@@ -193,7 +193,7 @@ class Page
             $refresh,
             function() use ($expire, $history)
             {
-                // Redirect requested
+                // Force redirect by application router (not status code)
                 if ($location = $this->connection->getRedirect())
                 {
                     // Follow
@@ -207,40 +207,40 @@ class Page
                     return false; // stop
                 }
 
-                // Response form requested
-                if ($request = $this->connection->getRequest())
-                {
-                    // Update title
-                    $this->title->set(
-                        $this->connection->getTitle(),
-                        $this->connection->getSubtitle(),
-                        $this->connection->getTooltip()
-                    );
-
-                    // Refresh header by new title if current page is active
-                    if ($this === $this->container->tab->get())
-                    {
-                        $this->container->browser->header->setTitle(
-                            $this->title->getValue(),
-                            $this->title->getSubtitle()
-                        );
-                    }
-
-                    // Show response form
-                    $this->response->show(
-                        $request['placeholder'],
-                        $request['visible']
-                    );
-
-                    // Hide progressbar
-                    $this->progressbar->hide();
-
-                    return false; // stop
-                }
-
-                // Stop event loop on request completed
+                // Request completed
                 if ($this->connection->isCompleted())
                 {
+                    // Response form requested
+                    if ($request = $this->connection->getRequest())
+                    {
+                        // Update title
+                        $this->title->set(
+                            $this->connection->getTitle(),
+                            $this->connection->getSubtitle(),
+                            $this->connection->getTooltip()
+                        );
+
+                        // Refresh header by new title if current page is active
+                        if ($this === $this->container->tab->get())
+                        {
+                            $this->container->browser->header->setTitle(
+                                $this->title->getValue(),
+                                $this->title->getSubtitle()
+                            );
+                        }
+
+                        // Show response form
+                        $this->response->show(
+                            $request['placeholder'],
+                            $request['visible']
+                        );
+
+                        // Hide progressbar
+                        $this->progressbar->hide();
+
+                        return false; // stop at this point, do not update page data
+                    }
+
                     // Update title
                     $this->title->set(
                         $this->connection->getTitle(),