Changeset c4cdd7

Timestamp:

04/27/2009 12:55:42 PM (16 years ago)

Author:

Damien Churchill <damoc@gmail.com>

Branches:

2.0.x, develop, extjs4-port, master

Children:

e837493

Parents:

a9392f

Message:

change the "ready" event to "connected" and fix the failure event
handler

File:

• deluge/ui/web/js/Deluge.Client.js (modified) (3 diffs)

deluge/ui/web/js/Deluge.Client.js

@@ -44 +44 @@
                 // raw events
                 /**
-                 * @event ready
+                 * @event connected
                  * Fires when the client has retrieved the list of methods from the server.
                  * @param {Ext.ux.util.RpcClient} this
                  */
-                 'ready'
+                 'connected'
             );
             this.reloadMethods();
@@ -86 +86 @@
         },
         
-        _onFailure: function(response, options) {
-            if (response.status == 500) {
-                //error
+        _onFailure: function(response, requestOptions) {
+            var options = requestOptions.options;
+            errorObj = {
+                id: options.id,
+                result: null,
+                error: 'HTTP' + response.status
+            }            
+            if (Ext.type(options.failure) != 'function') return;
+            if (options.scope) {
+                options.failure.call(options.scope, responseObj.error, responseObj, response);
+            } else {
+                options.failure(responseObj.error, responseObj, response);
             }
-            errorObj = {
-                id: options.options.id
-            }
-            //alert(Ext.encode(errorObj));
         },
         
@@ -162 +167 @@
             
             this._components = Ext.keys(components);
-            this.fireEvent('ready', this);
+            this.fireEvent('connected', this);
         }
     });