Revision: 8035
Author: [email protected]
Date: Tue May 4 05:10:51 2010
Log: Adds the $wnd scope to calls to JSON.stringify().
http://code.google.com/p/google-web-toolkit/source/detail?r=8035
Modified:
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/client/impl/ClientRequestHelper.java
/branches/2.1/bikeshed/src/com/google/gwt/valuestore/shared/impl/RecordJsoImpl.java
/branches/2.1/bikeshed/war/Expenses.html
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/client/impl/ClientRequestHelper.java
Thu Apr 29 07:36:37 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/requestfactory/client/impl/ClientRequestHelper.java
Tue May 4 05:10:51 2010
@@ -39,7 +39,7 @@
}-*/;
private native String toJsonString()/*-{
- return JSON.stringify(this);
+ return $wnd.JSON.stringify(this);
}-*/;
}
=======================================
---
/branches/2.1/bikeshed/src/com/google/gwt/valuestore/shared/impl/RecordJsoImpl.java
Thu Apr 29 07:36:37 2010
+++
/branches/2.1/bikeshed/src/com/google/gwt/valuestore/shared/impl/RecordJsoImpl.java
Tue May 4 05:10:51 2010
@@ -175,12 +175,12 @@
// }
// return value;
// }
- // return JSON.stringify(this, replacer);
+ // return $wnd.JSON.stringify(this, replacer);
var key = this.__key;
delete this.__key;
// TODO verify that the stringify() from json2.js works on IE
- var rtn = JSON.stringify(this);
+ var rtn = $wnd.JSON.stringify(this);
this.__key = key;
return rtn;
}-*/;
@@ -199,9 +199,9 @@
// }
// return;
// }
- // return JSON.stringify(this, replacer);
+ // return $wnd.JSON.stringify(this, replacer);
var object = { id: this.id, version: this.version };
- return JSON.stringify(object);
+ return $wnd.JSON.stringify(object);
}-*/;
private native boolean copyPropertyIfDifferent(String name,
RecordJsoImpl from) /*-{
=======================================
--- /branches/2.1/bikeshed/war/Expenses.html Wed Apr 28 08:53:39 2010
+++ /branches/2.1/bikeshed/war/Expenses.html Tue May 4 05:10:51 2010
@@ -17,8 +17,8 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<title>Expenses</title>
- <script type="text/javascript" language="javascript"
src="expenses/expenses.nocache.js"></script>
<script type="text/javascript" language="javascript"
src="json2.js"></script>
+ <script type="text/javascript" language="javascript"
src="expenses/expenses.nocache.js"></script>
</head>
<body>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
