DataObjects/Core_notify.php

[Pman.Core] / Pman.Request.js

diff --git a/Pman.Request.js b/Pman.Request.js
index 57f6dd6..6eb9ee0 100644 (file)
--- a/Pman.Request.js
+++ b/Pman.Request.js
@@ -74,17 +74,15 @@ 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 && res.errorMsg ?  res.errorMsg : "Error Sending data");
@@ -100,13 +98,13 @@ 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 (res !== true) {
             var decode = this.processResponse(response);
             Roo.log(decode);
-            if (Roo.MessageBox.isVisable()) {
-                alert(decode && decode.errorMsg ?  decode.errorMsg : "Error Sending data");
+            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");