Changeset 0e99d37 in github

Timestamp:

Jun 1, 2009 11:35:53 AM (4 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

47f0725

Parents:

0ce11986

Message:

Use event system on the client to handle ajax callbacks

Location:

program

Files:

• include/rcube_json_output.php (modified) (3 diffs)
• include/rcube_template.php (modified) (1 diff)
• js/app.js (modified) (1 diff)
• js/common.js (modified) (2 diffs)

program/include/rcube_json_output.php

@@ -34 +34 @@
     private $texts = array();
     private $commands = array();
+    private $callbacks = array();
     private $message = null;
 
@@ -123 +124 @@
     public function command()
     {
-        $this->commands[] = func_get_args();
+        $cmd = func_get_args();
+        
+        if (strpos($cmd[0], 'plugin.') === 0)
+          $this->callbacks[] = $cmd;
+        else
+          $this->commands[] = $cmd;
     }
     
@@ -228 +234 @@
           $response['texts'] = $this->texts;
 
-        // send response code
+        // send function calls
         $response['exec'] = $this->get_js_commands() . $add;
+        
+        if (!empty($this->callbacks))
+          $response['callbacks'] = $this->callbacks;
 
         echo json_serialize($response);

program/include/rcube_template.php

@@ -202 +202 @@
     public function command()
     {
-        $this->js_commands[] = func_get_args();
+        $cmd = func_get_args();
+        if (strpos($cmd[0], 'plugin.') === false)
+          $this->js_commands[] = $cmd;
     }
 

program/js/app.js

@@ -3924 +3924 @@
       eval(response.exec);
     }
+    
+    // execute callback functions of plugins
+    if (response.callbacks && response.callbacks.length) {
+      for (var i=0; i < response.callbacks.length; i++)
+        this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
+    }
  
     // process the response data according to the sent action

program/js/common.js

@@ -289 +289 @@
   var ret, h;
   if (typeof e == 'undefined')
-    e = {};
-  if (typeof e == 'object')
+    e = this;
+  else if (typeof e == 'object')
     e.event = evt;
   
@@ -298 +298 @@
       if ((h = this._events[evt][i])) {
         if (typeof h.func == 'function')
-          ret = h.func.call ? h.func.call(h.obj, this, e) : h.func(this, e);
+          ret = h.func.call ? h.func.call(h.obj, e) : h.func(e);
         else if (typeof h.obj[h.func] == 'function')
-          ret = h.obj[h.func](this, e);
+          ret = h.obj[h.func](e);
               
         // cancel event execution