svn commit: samba r9228 - in
branches/SAMBA_4_0/swat/scripting/client: .
tridge at samba.org
tridge at samba.org
Wed Aug 10 07:03:11 GMT 2005
Author: tridge
Date: 2005-08-10 07:03:10 +0000 (Wed, 10 Aug 2005)
New Revision: 9228
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9228
Log:
cleanup and simplify the AJAJ code - part 2
Modified:
branches/SAMBA_4_0/swat/scripting/client/call.js
Changeset:
Modified: branches/SAMBA_4_0/swat/scripting/client/call.js
===================================================================
--- branches/SAMBA_4_0/swat/scripting/client/call.js 2005-08-10 06:58:05 UTC (rev 9227)
+++ branches/SAMBA_4_0/swat/scripting/client/call.js 2005-08-10 07:03:10 UTC (rev 9228)
@@ -48,7 +48,7 @@
The callback() function is called with the returned
object. 'callback' may be null.
*/
-function vserver_call(url, func, callback, args) {
+function vserver_call_url(url, func, callback, args) {
var args2 = new Object();
args2.length = args.length;
var i;
@@ -58,7 +58,7 @@
var req = __http_object();
req.open("POST", url, true);
req.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
- req.send("func=" + func + "&args=" + encodeObject(args2));
+ req.send("ajaj_func=" + func + "&ajaj_args=" + encodeObject(args2));
req.onreadystatechange = function() {
if (4 == req.readyState && callback != null) {
var o = decodeObject(req.responseText);
@@ -71,7 +71,7 @@
/*
usage:
- server_call(url, func, callback, ...);
+ server_call_url(url, func, callback, ...);
'func' is a function name to call on the server
any additional arguments are passed to func() on the server
@@ -79,14 +79,14 @@
The callback() function is called with the returned
object. 'callback' may be null.
*/
-function server_call(url, func, callback) {
+function server_call_url(url, func, callback) {
var args = new Object();
var i;
for (i=3;i<arguments.length;i++) {
args[i-3] = arguments[i];
}
args.length = i-3;
- vserver_call(url, func, callback, args);
+ vserver_call_url(url, func, callback, args);
}
@@ -94,5 +94,25 @@
call printf on the server
*/
function srv_printf() {
- vserver_call('/scripting/general_calls.esp', 'srv_printf', null, arguments);
+ vserver_call_url('/scripting/general_calls.esp', 'srv_printf', null, arguments);
}
+
+/*
+ usage:
+
+ server_call(func, callback, ...);
+
+ 'func' is a function name to call on the server
+ any additional arguments are passed to func() on the server
+
+ The callback() function is called with the returned
+ object. 'callback' may be null.
+*/
+function server_call(func, callback) {
+ var args = new Array(arguments.length-2);
+ var i;
+ for (i=0;i<args.length;i++) {
+ args[i] = arguments[i+1];
+ }
+ vserver_call_url("@request.REQUEST_URI", func, callback, args);
+}
More information about the samba-cvs
mailing list