From 525871173d7d1644db4eaf88ce8ceecf67a09583 Mon Sep 17 00:00:00 2001
From: reioto <reioto77@gmail.com>
Date: Mon, 25 Aug 2014 14:39:33 +0900
Subject: [PATCH] fixed callbacks in call-method

---
 jquery.jsonrpcclient.js | 55 ++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/jquery.jsonrpcclient.js b/jquery.jsonrpcclient.js
index 1adba00..e57f8b6 100644
--- a/jquery.jsonrpcclient.js
+++ b/jquery.jsonrpcclient.js
@@ -123,29 +123,38 @@
       cache      : false,
       headers    : this.options.headers,
       xhrFields  : this.options.xhrFields,
-
-      success    : function(data) {
-        if ('error' in data) {
-          errorCb(data.error);
-        } else {
-          successCb(data.result);
-        }
-      },
-
-      // JSON-RPC Server could return non-200 on error
-      error    : function(jqXHR, textStatus, errorThrown) {
-        try {
-          var response = self.JSON.parse(jqXHR.responseText);
-          if ('console' in window) { console.log(response); }
-
-          errorCb(response.error);
-        }
-        catch (err) {
-          // Perhaps the responseText wasn't really a jsonrpc-error.
-          errorCb({error: jqXHR.responseText});
-        }
-      }
-    });
+    })
+    .then(
+        function(data, textStatus, jqXHR) {
+            var checkDeferred = new $.Deferred; 
+            if ('error' in data) {
+              errorCb(data.error);
+              checkDeferred.reject(data, 'error', jqXHR);
+            } else {
+              successCb(data.result);
+              checkDeferred.resolve(data, textStatus, jqXHR);
+             }
+           return checkDeferred.promise();
+         },
+         
+        // JSON-RPC Server could return non-200 on error
+        function(jqXHR, textStatus, errorThrown) {
+            var errorDeferred = new $.Deferred;
+            
+          try {
+              var response = self.JSON.parse(jqXHR.responseText);
+              if ('console' in window) { console.log(response); }
+              errorCb(response.error);
+              errorDeferred.reject(response.error, textStatus, errorThrown);
+           }
+            catch (err) {
+            // Perhaps the responseText wasn't really a jsonrpc-error.
+            var errorObj = {error: jqXHR.responseText}; 
+            errorCb(errorObj);
+            errorDeferred.reject(errorObj, textStatus, errorThrown);
+           }
+           return errorDeferred.promise();
+        });
 
     return deferred;
   };