move callbacks from session to array

everlutionsk · Sep 5, 2017 · f583c9a · f583c9a
1 parent fc5dd60
commit f583c9a
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/Ajaxcom.php b/src/Ajaxcom.php
@@ -39,6 +39,8 @@ class Ajaxcom
     private $addBlocks = [];
     /** @var string[] */
     private $removeBlocks = [];
+    /** @var Callback[] */
+    private $callbacks = [];
     /** @var bool */
     private $modal = false;
 
@@ -114,9 +116,7 @@ public function renderAjaxBlock(string $id, array $callbacks = []): self
 
     public function addCallback(Callback $callback)
     {
-        $callbacks = $this->session->get(self::AJAXCOM_CALLBACKS, []);
-        $callbacks[] = $callback;
-        $this->session->set(self::AJAXCOM_CALLBACKS, $callbacks);
+        $this->callbacks[] = $callback;
 
         return $this;
     }
@@ -228,12 +228,9 @@ private function addBlocks(Handler $ajax, string $view, array $parameters): Hand
      */
     private function addCallbacks(Handler $ajax): Handler
     {
-        $callbacks = $this->session->get(self::AJAXCOM_CALLBACKS, []);
-        /** @var Callback $callback */
-        foreach ($callbacks as $callback) {
+        foreach ($this->callbacks as $callback) {
             $ajax->callback($callback->getFunction(), $callback->getParameters());
         }
-        $this->session->remove(self::AJAXCOM_CALLBACKS);
 
         return $ajax;
     }