X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Request.js;h=b4db0f0783dd2c3c096a2fea9cc96d53ec154817;hp=6aa40aa0c33c2748591653c0e6ed4550d9c3a8e1;hb=refs%2Fheads%2Fwip_edward_T5851_download_old_offer_sheet;hpb=5e5809ab3285c6142a13802888a9b2c612d84d9c diff --git a/Pman.Request.js b/Pman.Request.js index 6aa40aa0..b4db0f07 100644 --- a/Pman.Request.js +++ b/Pman.Request.js @@ -25,22 +25,26 @@ var t = new Pman.Request({ * request, a url encoded string or a function to call to get either. * @cfg {Function} success called with ( JSON decoded data of the data.. ) * @cfg {Function} success called with ( JSON decoded data of the data.. ) +* @cfg {Boolean} showFailureDialog (true|false) default true */ Pman.Request = function(config){ Pman.Request.superclass.constructor.call(this, config); - this.request(config); - if (this.mask && this.maskEl) { + if (this.mask) { + this.maskEl = this.maskEl || Roo.get(document.body); Roo.get(this.maskEl).mask(this.mask); } - + this.request(config); + } Roo.extend(Pman.Request, Roo.data.Connection, { // private + showFailureDialog : true, + processResponse : function(response) { // convert the Roo Connection response into JSON data. @@ -73,20 +77,18 @@ Roo.extend(Pman.Request, Roo.data.Connection, { this.fireEvent("requestcomplete", this, response, options); if (this.mask && this.maskEl) { - Roo.get(this.maskEl).unmask(); + Roo.get(this.maskEl).unmask(true); } - var res = this.processResponse(response); if (!res.success) { // error! if (options.failure) { // failure is handled... - do not show error.. - if (true === Roo.callback(options.failure, options.scope, [res, options])) { - return; - } + Roo.callback(options.failure, options.scope, [res, options]); + return; } Roo.MessageBox.hide(); // hide any existing messages.. - Roo.MessageBox.alert("Error", res.errorMsg ? res.errorMsg : "Error Sending"); + Roo.MessageBox.alert("Error", res && res.errorMsg ? res.errorMsg : "Error Sending data"); return; } Roo.callback(options.success, options.scope, [res, options]); @@ -99,13 +101,22 @@ Roo.extend(Pman.Request, Roo.data.Connection, { this.fireEvent("requestexception", this, response, options, e); var res = Roo.callback(options.failure, options.scope, [response, options]); if (this.mask && this.maskEl) { - Roo.get(this.maskEl).unmask(); + Roo.get(this.maskEl).unmask(true); + } + if(!this.showFailureDialog){ + return; } if (res !== true) { var decode = this.processResponse(response); - - Roo.MessageBox.hide(); // hide any existing messages.. - Roo.MessageBox.alert("Error", "Error Sending" + decode.errorMsg); + Roo.log(decode); + + if (Roo.MessageBox.isVisible()) { + alert(decode && decode.errorMsg ? decode.errorMsg : "Error Sending data - return true from failure to remove message"); + return; + } + + Roo.MessageBox.alert("Error", decode && decode.errorMsg ? decode.errorMsg : "Error Sending data"); + } } -}); \ No newline at end of file +});