From 2a721795976530427f787850e246c38b7ee64e02 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 8 Mar 2012 11:44:49 +0530 Subject: [PATCH] fix in messages --- js/all-app.js | 2 +- js/all-web.js | 6 +++--- version.num | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index 14491a81a5..4b2637dcad 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -218,7 +218,7 @@ if(r.server_messages)msgprint(r.server_messages) if(r.exc){errprint(r.exc);console.log(r.exc);};if(r.docs)LocalDB.sync(r.docs);} wn.request.call=function(opts){wn.request.prepare(opts);$.ajax({url:opts.url||wn.request.url,data:opts.args,type:opts.type||'POST',dataType:opts.dataType||'json',success:function(r,xhr){wn.request.cleanup(opts,r);opts.success(r,xhr.responseText);},error:function(xhr,textStatus){wn.request.cleanup(opts,{});msgprint('Unable to complete request: '+textStatus) if(opts.error)opts.error(xhr)}})} -wn.call=function(opts){var args=opts.args||{};if(opts.module&&opts.page){args.cmd=module+'.page.'+page+'.'+page+'.'+method}else if(opts.method){args.cmd=opts.method;} +wn.call=function(opts){var args=opts.args||{};if(opts.module&&opts.page){args.cmd=opts.module+'.page.'+opts.page+'.'+opts.page+'.'+opts.method}else if(opts.method){args.cmd=opts.method;} wn.request.call({args:args,success:opts.callback,error:opts.error,btn:opts.btn,freeze:opts.freeze,show_spinner:!opts.no_spinner});} /* * lib/js/core.js diff --git a/js/all-web.js b/js/all-web.js index ac2e7c1bc6..2e0471728a 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -164,7 +164,7 @@ if(r.server_messages)msgprint(r.server_messages) if(r.exc){errprint(r.exc);console.log(r.exc);};if(r.docs)LocalDB.sync(r.docs);} wn.request.call=function(opts){wn.request.prepare(opts);$.ajax({url:opts.url||wn.request.url,data:opts.args,type:opts.type||'POST',dataType:opts.dataType||'json',success:function(r,xhr){wn.request.cleanup(opts,r);opts.success(r,xhr.responseText);},error:function(xhr,textStatus){wn.request.cleanup(opts,{});msgprint('Unable to complete request: '+textStatus) if(opts.error)opts.error(xhr)}})} -wn.call=function(opts){var args=opts.args||{};if(opts.module&&opts.page){args.cmd=module+'.page.'+page+'.'+page+'.'+method}else if(opts.method){args.cmd=opts.method;} +wn.call=function(opts){var args=opts.args||{};if(opts.module&&opts.page){args.cmd=opts.module+'.page.'+opts.page+'.'+opts.page+'.'+opts.method}else if(opts.method){args.cmd=opts.method;} wn.request.call({args:args,success:opts.callback,error:opts.error,btn:opts.btn,freeze:opts.freeze,show_spinner:!opts.no_spinner});} /* * lib/js/core.js @@ -684,8 +684,8 @@ $.extend(this,this.opts);this.prepare_opts();$(this.parent).html(repl('\

%(title)s

\
\