[Checkins] SVN: z3c.jsonrpcproxy/trunk/ let error (content) pass to calling callback method and skip alert call

[Roger Ineichen]

Log message for revision 103115:
  let error (content) pass to calling callback method and skip alert call
  

Changed:
  U   z3c.jsonrpcproxy/trunk/CHANGES.txt
  U   z3c.jsonrpcproxy/trunk/setup.py
  U   z3c.jsonrpcproxy/trunk/src/z3c/jsonrpcproxy/js/z3c.jsonrpcproxy-0.5.0.js

-=-
Modified: z3c.jsonrpcproxy/trunk/CHANGES.txt
===================================================================
--- z3c.jsonrpcproxy/trunk/CHANGES.txt	2009-08-23 18:23:00 UTC (rev 103114)
+++ z3c.jsonrpcproxy/trunk/CHANGES.txt	2009-08-23 19:44:53 UTC (rev 103115)
@@ -2,15 +2,18 @@
 CHANGES
 =======
 
-Version 0.5.1dev (unreleased)
------------------------------
+0.6.0 (unreleased)
+------------------
 
 - Implemented JSON-RPC 2.0 specification. Use JSON-RPC 2.0 version as default.
   Optional the version 1.0 and 1.1 can be set. See JSON-RPC 2.0 specification
   for more information.
 
+- skip alert on errors, pass them to the calling javascript method if callback
+  method is given
 
-Version 0.5.0 (2008-04-16)
--------------------------
 
+0.5.0 (2008-04-16)
+------------------
+
 - Initial Release

Modified: z3c.jsonrpcproxy/trunk/setup.py
===================================================================
--- z3c.jsonrpcproxy/trunk/setup.py	2009-08-23 18:23:00 UTC (rev 103114)
+++ z3c.jsonrpcproxy/trunk/setup.py	2009-08-23 19:44:53 UTC (rev 103115)
@@ -22,7 +22,7 @@
 
 setup (
     name='z3c.jsonrpcproxy',
-    version='0.5.1dev',
+    version='0.6.0',
     author = "Roger Ineichen and the Zope Community",
     author_email = "zope3-dev at zope.org",
     description = "JSON RPC (javascript) proxy implementation for Zope3",

Modified: z3c.jsonrpcproxy/trunk/src/z3c/jsonrpcproxy/js/z3c.jsonrpcproxy-0.5.0.js
===================================================================
--- z3c.jsonrpcproxy/trunk/src/z3c/jsonrpcproxy/js/z3c.jsonrpcproxy-0.5.0.js	2009-08-23 18:23:00 UTC (rev 103114)
+++ z3c.jsonrpcproxy/trunk/src/z3c/jsonrpcproxy/js/z3c.jsonrpcproxy-0.5.0.js	2009-08-23 19:44:53 UTC (rev 103115)
@@ -2,7 +2,7 @@
 /** 
  * @fileoverview JSON-RPC client implementation 
  * @author Roger Ineichen dev at projekt01 dot ch
- * @version 0.6, supports JSON-RPC 1.0, 1.1 and 2.0
+ * @version 0.5.0 supports JSON-RPC 1.0, 1.1 and 2.0
  */
 //----------------------------------------------------------------------------
 
@@ -157,16 +157,9 @@
             alert("The server responded with an empty document.");
         }else{
             var res = this.unmarshall(respTxt);
-            var oldVersion = false;
-            if (this.version == '1.0' || this.version == '1.1') {
-                oldVersion = true;
+            if(res.error != null){
+                return res.error
             }
-            if(oldVersion  && res.error != null){
-                alert(res.error);
-            }
-            else if(!oldVersion  && res.error != null){
-                alert(res.error.message);
-            }
             else if (res.requestId != self.requestId) {
                 alert("wrong json id returned");
             }