rename Callback::terminateJsonIfCanTerminate() method

atk4 · Mar 27, 2024 · 414b48b · 414b48b
1 parent 1d26954
commit 414b48b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/src/Callback.php b/src/Callback.php
@@ -89,7 +89,7 @@ public function set($fx = null, $fxArgs = null)
     /**
      * Terminate this callback by rendering the given view.
      */
-    public function terminateJson(View $view): void
+    public function terminateJsonIfCanTerminate(View $view): void
     {
         if ($this->canTerminate()) {
             $this->getApp()->terminateJson($view);

diff --git a/src/Loader.php b/src/Loader.php
@@ -85,7 +85,8 @@ public function set($fx = null)
 
         $this->cb->set(function () use ($fx) {
             $fx($this);
-            $this->cb->terminateJson($this->getShimIfOwner());
+
+            $this->cb->terminateJsonIfCanTerminate($this->getShimIfOwner());
         });
 
         return $this;

diff --git a/src/Modal.php b/src/Modal.php
@@ -98,7 +98,8 @@ public function enableCallback(): void
 
         $this->cb->set(function () {
             ($this->fx)($this->cbView);
-            $this->cb->terminateJson($this->cbView);
+
+            $this->cb->terminateJsonIfCanTerminate($this->cbView);
         });
     }
 

diff --git a/src/Panel/Content.php b/src/Panel/Content.php
@@ -50,7 +50,8 @@ public function onLoad(\Closure $fx): void
     {
         $this->cb->set(function () use ($fx) {
             $fx($this);
-            $this->cb->terminateJson($this);
+
+            $this->cb->terminateJsonIfCanTerminate($this);
         });
     }
 

diff --git a/src/Popup.php b/src/Popup.php
@@ -151,9 +151,8 @@ public function set($fx = null)
 
             $fx($content);
 
-            // only render our content view
-            // PopupService will replace content with this one
-            $this->cb->terminateJson($content);
+            // only render our content view, PopupService will replace content with this one
+            $this->cb->terminateJsonIfCanTerminate($content);
         });
 
         return $this;