Revision: 6946 Author: [email protected] Date: Mon Nov 16 18:58:42 2009 Log: Reverting r6936 because it causes FF tests to fail.
Patch by: jlabanca http://code.google.com/p/google-web-toolkit/source/detail?r=6946 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/json/client/JSONObject.java ======================================= --- /releases/2.0/branch-info.txt Mon Nov 16 17:21:38 2009 +++ /releases/2.0/branch-info.txt Mon Nov 16 18:58:42 2009 @@ -706,11 +706,6 @@ svn merge --ignore-ancestry -c6933 \ https://google-web-toolkit.googlecode.com/svn/trunk/ . -tr...@6935 was merged into this branch - Fix JSONObject with Chrome DevMode. - svn merge --ignore-ancestry -c6935 \ - https://google-web-toolkit.googlecode.com/svn/trunk/ . - tr...@6937 was merged into this branch Minor tweaks to MissingPlugin. Updates IE download plugin. Style tweaks. svn merge -c6937 --ignore-ancestry http://google-web-toolkit.googlecode.com/svn/trunk/ . ======================================= --- /releases/2.0/user/src/com/google/gwt/json/client/JSONObject.java Mon Nov 16 16:00:09 2009 +++ /releases/2.0/user/src/com/google/gwt/json/client/JSONObject.java Mon Nov 16 18:58:42 2009 @@ -195,9 +195,7 @@ private native void addAllKeys(Collection<String> s) /*-{ var jsObject = [email protected]::jsObject; for (var key in jsObject) { - if (jsObject.hasOwnProperty(key)) { - [email protected]::add(Ljava/lang/Object;)(key); - } + [email protected]::add(Ljava/lang/Object;)(key); } }-*/; @@ -215,9 +213,7 @@ var jsObject = [email protected]::jsObject; var i = 0; for (var key in jsObject) { - if (jsObject.hasOwnProperty(key)) { - result[i++] = key; - } + result[i++] = key; } return result; }-*/; @@ -226,19 +222,13 @@ var jsObject = [email protected]::jsObject; var size = 0; for (var key in jsObject) { - if (jsObject.hasOwnProperty(key)) { - ++size; - } + ++size; } return size; }-*/; private native JSONValue get0(String key) /*-{ - var jsObject = [email protected]::jsObject; - var v; - if (jsObject.hasOwnProperty(key)) { - v = jsObject[key]; - } + var v = [email protected]::jsObject[key]; var func = @com.google.gwt.json.client.JSONParser::typeMap[typeof v]; return func ? func(v) : @com.google.gwt.json.client.JSONParser::throwUnknownTypeException(Ljava/lang/String;)(typeof v); }-*/; -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
