You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by br...@apache.org on 2014/02/18 22:51:03 UTC
svn commit: r1569538 - in /jspwiki/trunk: ChangeLog
jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki-war/src/main/java/org/apache/wiki/rpc/json/JSONRPCManager.java
Author: brushed
Date: Tue Feb 18 21:51:03 2014
New Revision: 1569538
URL: http://svn.apache.org/r1569538
Log:
2.10.1-svn-6 : Fixing the JSONRPCMAnager.emitJSONCall(..) to render correct javascript.
Modified:
jspwiki/trunk/ChangeLog
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rpc/json/JSONRPCManager.java
Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1569538&r1=1569537&r2=1569538&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Feb 18 21:51:03 2014
@@ -1,3 +1,21 @@
+2014-02-18 Dirk Frederickx (brushed AT apache DOT org)
+
+ * 2.10.1-svn-6
+
+ * Fixing the JSONRPCMAnager.emitJSONCall(..) so that it now renders
+ the correct JSON RPC invocation javascript.
+
+ You can test the RPCSamplePlugin like this:
+
+ [{RPCSamplePlugin
+
+ test
+ }]
+
+ We are still getting error-code: 490, "No permission to access this AJAX method!"
+ when invoking a plugin generated json-rpc call.
+
+
2014-02-14 Dirk Frederickx (brushed AT apache DOT org)
* 2.10.1-svn-5
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1569538&r1=1569537&r2=1569538&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue Feb 18 21:51:03 2014
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "5";
+ public static final String BUILD = "6";
/**
* This is the generic version string you should use when printing out the version. It is of
Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rpc/json/JSONRPCManager.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rpc/json/JSONRPCManager.java?rev=1569538&r1=1569537&r2=1569538&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rpc/json/JSONRPCManager.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/rpc/json/JSONRPCManager.java Tue Feb 18 21:51:03 2014
@@ -77,11 +77,23 @@ public final class JSONRPCManager extend
* @return generated JavasSript code snippet that calls the method
*/
public static String emitJSONCall(WikiContext context, RPCCallable c, String function, String params) {
+
StringBuffer sb = new StringBuffer();
- sb.append("<script>");
- sb.append("var result = jsonrpc." + getId(c) + "." + function + "(" + params + ");\r\n");
- sb.append("document.write(result);\r\n");
- sb.append("</script>");
+ String method = getId(c) + "." + function;
+ sb.append("<span class='json-result' id='"+ method + "'></span>"); //placeholder to add results of jsonrpc
+ sb.append("<script>\r\n");
+
+ //sb.append("var result = jsonrpc." + getId(c) + "." + function + "(" + params + ");\r\n");
+ //sb.append("document.write(result);\r\n");
+
+ sb.append("window.addEvent('domready', function(){ \r\n");
+ sb.append(" Wiki.jsonrpc('" + method + "',[" + params + "],function(result){ \r\n");
+ sb.append(" console.log(result);\r\n");
+ sb.append(" $('" + method + "').innerHTML = result;\r\n");
+ sb.append(" });\r\n");
+ sb.append("});\r\n");
+
+ sb.append("</script>\r\n");
return sb.toString();
}
@@ -130,10 +142,12 @@ public final class JSONRPCManager extend
* @return the ID of the registered callable object
*/
public static String registerJSONObject(WikiContext context, RPCCallable c) {
+
String id = getId(c);
+
getBridge(context).registerObject(id, c);
-
requestJSON(context);
+
return id;
}
@@ -143,6 +157,9 @@ public final class JSONRPCManager extend
* @param context The WikiContext.
*/
public static void requestJSON(WikiContext context) {
+
+ /* Deprecated.
+ All json stuff is in jspwiki-common.js; not need to inject jsonrpc.js
TemplateManager.addResourceRequest(context,
TemplateManager.RESOURCE_SCRIPT,
context.getURL(WikiContext.NONE, "scripts/json-rpc/jsonrpc.js"));
@@ -151,6 +168,7 @@ public final class JSONRPCManager extend
TemplateManager.addResourceRequest(context,
TemplateManager.RESOURCE_JSFUNCTION,
"jsonrpc = new JSONRpcClient(\"" + jsonurl + "\");");
+ */
getBridge(context).registerCallback(new WikiJSONAccessor(), HttpServletRequest.class);
}