Revision: 6936
Author: [email protected]
Date: Mon Nov 16 16:00:09 2009
Log: Merge trunk r6935 into this branch
Fix JSONObject with Chrome DevMode.
svn merge --ignore-ancestry -c6935 \
https://google-web-toolkit.googlecode.com/svn/trunk/ .
http://code.google.com/p/google-web-toolkit/source/detail?r=6936
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 15:49:37 2009
+++ /releases/2.0/branch-info.txt Mon Nov 16 16:00:09 2009
@@ -705,3 +705,8 @@
Update MissingPlugin app and associated legacy HTML page.
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/ .
=======================================
--- /releases/2.0/user/src/com/google/gwt/json/client/JSONObject.java Thu
Feb 19 22:19:58 2009
+++ /releases/2.0/user/src/com/google/gwt/json/client/JSONObject.java Mon
Nov 16 16:00:09 2009
@@ -195,7 +195,9 @@
private native void addAllKeys(Collection<String> s) /*-{
var jsObject = [email protected]::jsObject;
for (var key in jsObject) {
- [email protected]::add(Ljava/lang/Object;)(key);
+ if (jsObject.hasOwnProperty(key)) {
+ [email protected]::add(Ljava/lang/Object;)(key);
+ }
}
}-*/;
@@ -213,7 +215,9 @@
var jsObject = [email protected]::jsObject;
var i = 0;
for (var key in jsObject) {
- result[i++] = key;
+ if (jsObject.hasOwnProperty(key)) {
+ result[i++] = key;
+ }
}
return result;
}-*/;
@@ -222,13 +226,19 @@
var jsObject = [email protected]::jsObject;
var size = 0;
for (var key in jsObject) {
- ++size;
+ if (jsObject.hasOwnProperty(key)) {
+ ++size;
+ }
}
return size;
}-*/;
private native JSONValue get0(String key) /*-{
- var v = [email protected]::jsObject[key];
+ var jsObject = [email protected]::jsObject;
+ var v;
+ if (jsObject.hasOwnProperty(key)) {
+ v = 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
