Merge pull request #10 from pdobrev/patch-1

Animesh Kumar · Animesh Kumar · commit d83788913303 · 2012-08-15T15:33:30.000-07:00
Single quotes in the payload need to be escaped, since it's enclosed in ...
diff --git a/src/com/strumsoft/websocket/phonegap/WebSocket.java b/src/com/strumsoft/websocket/phonegap/WebSocket.java
@@ -397,7 +397,7 @@ public int getReadyState() {
 	 * @return
 	 */
 	private String buildJavaScriptData(String event, String msg) {
-		String _d = "javascript:WebSocket." + event + "(" + "{" + "\"_target\":\"" + id + "\"," + "\"data\":'" + msg
+		String _d = "javascript:WebSocket." + event + "(" + "{" + "\"_target\":\"" + id + "\"," + "\"data\":'" + msg.replaceAll("'", "\\\\'")
 				+ "'" + "}" + ")";
 		return _d;
 	}

Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ public int getReadyState() {`
`397`	`397`	`* @return`
`398`	`398`	`*/`
`399`	`399`	`private String buildJavaScriptData(String event, String msg) {`
`400`		`- String _d = "javascript:WebSocket." + event + "(" + "{" + "\"_target\":\"" + id + "\"," + "\"data\":'" + msg`
	`400`	`+ String _d = "javascript:WebSocket." + event + "(" + "{" + "\"_target\":\"" + id + "\"," + "\"data\":'" + msg.replaceAll("'", "\\\\'")`
`401`	`401`	`+ "'" + "}" + ")";`
`402`	`402`	`return _d;`
`403`	`403`	`}`