From 4042272863a83ceb4a7cfc5199958a128265f061 Mon Sep 17 00:00:00 2001 From: Frederic PAUT Date: Tue, 16 Apr 2013 10:56:08 +0200 Subject: [PATCH] request : removing successCB, errorCB as parameters in callMethod and using 'then' method instead (allowing to standardize 'this' in callback) --- cloudeebus/cloudeebus.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cloudeebus/cloudeebus.js b/cloudeebus/cloudeebus.js index 083dd79..1521426 100644 --- a/cloudeebus/cloudeebus.js +++ b/cloudeebus/cloudeebus.js @@ -535,7 +535,7 @@ cloudeebus.ProxyObject.prototype._addMethod = function(ifName, method, nArgs) { }; -cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, successCB, errorCB) { +cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args) { var self = this; var request = new cloudeebus.Request(this, successCB, errorCB); @@ -544,12 +544,13 @@ cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, suc request.result = eval(str); if (request.onsuccess) { try { // calling dbus hook object function for un-translated types - request.onsuccess.apply(request.proxy, request.result); + request.onsuccess.apply(request, request.result); } catch (e) { cloudeebus.log("Method callback exception: " + e); + request.error = e; if (request.onerror) - request.onerror(e); + request.onerror.apply(request, e); } } } @@ -558,7 +559,7 @@ cloudeebus.ProxyObject.prototype.callMethod = function(ifName, method, args, suc cloudeebus.log("Error calling method: " + method + " on object: " + self.objectPath + " : " + error.desc); request.error = error.desc; if (request.onerror) - request.onerror(request.error); + request.onerror.apply(request, request.error); } var arglist = [ -- 2.7.4