Changeset 6465a92 in github

Timestamp:

Sep 25, 2010 6:34:54 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

e019f2d

Parents:

22c6b5b6

Message:

• Support action in form of "task/action" in goto_url()

File:

• program/js/app.js (modified) (3 diffs)

program/js/app.js

@@ -4888 +4888 @@
   this.goto_url = function(action, query, lock)
   {
-    var querystring = query ? '&'+query : '';
-    this.redirect(this.env.comm_path+'&_action='+action+querystring, lock);
-  };
-
-  // send a http request to the server
-  this.http_request = function(action, querystring, lock)
-  {
-    var url = this.env.comm_path;
+    var url = this.env.comm_path,
+     querystring = query ? '&'+query : '';
 
     // overwrite task name
@@ -4903 +4897 @@
     }
 
+    this.redirect(url+'&_action='+action+querystring, lock);
+  };
+
+  // send a http request to the server
+  this.http_request = function(action, query, lock)
+  {
+    var url = this.env.comm_path;
+
+    // overwrite task name
+    if (action.match(/([a-z]+)\/([a-z-_]+)/)) {
+      action = RegExp.$2;
+      url = url.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+    }
+
     // trigger plugin hook
-    var result = this.triggerEvent('request'+action, querystring);
+    var result = this.triggerEvent('request'+action, query);
 
     if (typeof result != 'undefined') {
@@ -4911 +4919 @@
         return false;
       else
-        querystring = result;
-    }
-
-    url += '&_remote=1&_action=' + action + (querystring ? '&' : '') + querystring;
+        query = result;
+    }
+
+    url += '&_remote=1&_action=' + action + (query ? '&' : '') + query;
 
     // send request