# HG changeset patch # User Jaroslav Tulach # Date 1399993668 -7200 # Node ID 0db00da6f3755c5752f830bd3abdcbebe5c19a09 # Parent 58f2b09668d306a5bcc9027cf4dfdc6cc8aa8024 Using string references to make sure JavaQuery API works in obfuscated mode diff -r 58f2b09668d3 -r 0db00da6f375 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java Tue May 13 16:00:53 2014 +0200 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypes.java Tue May 13 17:07:48 2014 +0200 @@ -96,7 +96,7 @@ + " var el = window.document.getElementById(name);\n" + " el.parentNode.removeChild(el);\n" + " arr[0] = data;\n" - + " run.run__V();\n" + + " run['run__V']();\n" + "};\n" + "return true;\n" ) @@ -115,7 +115,7 @@ + " } catch (error) {;\n" + " throw 'Cannot parse' + error + ':' + this.response;\n" + " };\n" - + " callback.run__V();\n" + + " callback['run__V']();\n" + "};" + "request.send();" ) diff -r 58f2b09668d3 -r 0db00da6f375 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/KOList.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/KOList.java Tue May 13 16:00:53 2014 +0200 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/KOList.java Tue May 13 17:07:48 2014 +0200 @@ -140,7 +140,7 @@ } - @JavaScriptOnly(name = "koArray", value = "function() { return this.toArray___3Ljava_lang_Object_2(); }") + @JavaScriptOnly(name = "koArray", value = "function() { return this['toArray___3Ljava_lang_Object_2'](); }") private static native int koArray(); private void notifyChange() { diff -r 58f2b09668d3 -r 0db00da6f375 javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypesTest.java --- a/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypesTest.java Tue May 13 16:00:53 2014 +0200 +++ b/javaquery/api/src/test/java/org/apidesign/bck2brwsr/htmlpage/ConvertTypesTest.java Tue May 13 17:07:48 2014 +0200 @@ -28,9 +28,9 @@ */ public class ConvertTypesTest { @JavaScriptBody(args = { "includeSex" }, body = "var json = new Object();" - + "json.firstName = 'son';\n" - + "json.lastName = 'dj';\n" - + "if (includeSex) json.sex = 'MALE';\n" + + "json['firstName'] = 'son';\n" + + "json['lastName'] = 'dj';\n" + + "if (includeSex) json['sex'] = 'MALE';\n" + "return json;" ) private static native Object createJSON(boolean includeSex);