equal
deleted
inserted
replaced
310 function ajaxFuncArgs(fname, form /* ... */) { |
310 function ajaxFuncArgs(fname, form /* ... */) { |
311 form = form || {}; |
311 form = form || {}; |
312 $.extend(form, { |
312 $.extend(form, { |
313 'fname': fname, |
313 'fname': fname, |
314 'pageid': pageid, |
314 'pageid': pageid, |
315 'arg': $.map(cw.utils.sliceList(arguments, 2), jQuery.toJSON) |
315 'arg': $.map(cw.utils.sliceList(arguments, 2), JSON.stringify) |
316 }); |
316 }); |
317 return form; |
317 return form; |
318 } |
318 } |
319 |
319 |
320 /** |
320 /** |
743 function remoteExec(fname /* ... */) { |
743 function remoteExec(fname /* ... */) { |
744 setProgressCursor(); |
744 setProgressCursor(); |
745 var props = { |
745 var props = { |
746 fname: fname, |
746 fname: fname, |
747 pageid: pageid, |
747 pageid: pageid, |
748 arg: $.map(cw.utils.sliceList(arguments, 1), jQuery.toJSON) |
748 arg: $.map(cw.utils.sliceList(arguments, 1), JSON.stringify) |
749 }; |
749 }; |
750 var result = jQuery.ajax({ |
750 var result = jQuery.ajax({ |
751 url: AJAX_BASE_URL, |
751 url: AJAX_BASE_URL, |
752 data: props, |
752 data: props, |
753 async: false, |
753 async: false, |
763 function asyncRemoteExec(fname /* ... */) { |
763 function asyncRemoteExec(fname /* ... */) { |
764 setProgressCursor(); |
764 setProgressCursor(); |
765 var props = { |
765 var props = { |
766 fname: fname, |
766 fname: fname, |
767 pageid: pageid, |
767 pageid: pageid, |
768 arg: $.map(cw.utils.sliceList(arguments, 1), jQuery.toJSON) |
768 arg: $.map(cw.utils.sliceList(arguments, 1), JSON.stringify) |
769 }; |
769 }; |
770 // XXX we should inline the content of loadRemote here |
770 // XXX we should inline the content of loadRemote here |
771 var deferred = loadRemote(AJAX_BASE_URL, props, 'POST'); |
771 var deferred = loadRemote(AJAX_BASE_URL, props, 'POST'); |
772 deferred = deferred.addErrback(remoteCallFailed); |
772 deferred = deferred.addErrback(remoteCallFailed); |
773 deferred = deferred.addErrback(resetCursor); |
773 deferred = deferred.addErrback(resetCursor); |