Fixed the js call in the paginator.

jaxon-php · May 19, 2024 · 01c17e2 · 01c17e2
1 parent 2831761
commit 01c17e2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/src/Js/Call.php b/src/Js/Call.php
@@ -430,49 +430,49 @@ public function setPageNumber(int $nPageNumber): Call
     }
 
     /**
-     * Convert this call to array
+     * Convert the first call to array
      *
      * @return array
      */
     public function toArray(): array
     {
-        $aCalls = [[
+        return [
             '_type' => 'func',
             '_name' => $this->sFunction,
             'args' => array_map(function(JsonSerializable $xParam) {
                 return $xParam->jsonSerialize();
             }, $this->aParameters),
-        ]];
+        ];
+    }
+
+    /**
+     * Convert this call to array, when converting the response into json.
+     *
+     * @return array
+     */
+    public function jsonSerialize(): array
+    {
+        $aCalls = [$this->toArray()];
         if($this->bToInt)
         {
             $aCalls[] = $this->toIntCall();
         }
 
-        $aCall = ['_type' => 'expr', 'calls' => $aCalls];
+        $aExpr = ['_type' => 'expr', 'calls' => $aCalls];
         if(($this->aConfirm))
         {
-            $aCall['question'] = $this->aConfirm;
+            $aExpr['question'] = $this->aConfirm;
         }
         if(($this->aCondition))
         {
-            $aCall['condition'] = $this->aCondition;
+            $aExpr['condition'] = $this->aCondition;
         }
         if(($this->aMessage))
         {
-            $aCall['message'] = $this->aMessage;
+            $aExpr['message'] = $this->aMessage;
         }
 
-        return $aCall;
-    }
-
-    /**
-     * Convert this call to array, when converting the response into json.
-     *
-     * @return array
-     */
-    public function jsonSerialize(): array
-    {
-        return $this->toArray();
+        return $aExpr;
     }
 
     /**
@@ -482,7 +482,7 @@ public function jsonSerialize(): array
      */
     public function __toString(): string
     {
-        return 'jaxon.exec(' . json_encode($this->toArray()) . ')';
+        return 'jaxon.exec(' . json_encode($this->jsonSerialize()) . ')';
     }
 
     /**

diff --git a/src/Js/Parameter.php b/src/Js/Parameter.php
@@ -168,7 +168,7 @@ public function jsonSerialize()
         switch($this->getType())
         {
         case self::JS_CALL:
-            return $this->getValue()->toArray();
+            return $this->getValue()->jsonSerialize();
         case self::JS_VALUE:
             return [
                 '_type' => 'expr',

diff --git a/src/Plugin/Code/AssetManager.php b/src/Plugin/Code/AssetManager.php
@@ -35,7 +35,7 @@ class AssetManager
      *
      * @var string
      */
-    const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.0.0rc-6/dist';
+    const JS_LIB_URL = 'https://cdn.jsdelivr.net/gh/jaxon-php/jaxon-js@5.0.0rc-7/dist';
 
     /**
      * The constructor