svn commit: r724916 - in /incubator/shindig/branches/1.0.x-incubating: ./ javascript/container/gadgets.js

[lindner]

Author: lindner
Date: Tue Dec  9 14:24:45 2008
New Revision: 724916

URL: http://svn.apache.org/viewvc?rev=724916&view=rev
Log:
merge SHINDIG-715

Modified:
    incubator/shindig/branches/1.0.x-incubating/   (props changed)
    incubator/shindig/branches/1.0.x-incubating/javascript/container/gadgets.js

Propchange: incubator/shindig/branches/1.0.x-incubating/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec  9 14:24:45 2008
@@ -1 +1 @@
-/incubator/shindig/trunk:724511-724522,724874
+/incubator/shindig/trunk:724511-724522,724874,724915

Modified: 
incubator/shindig/branches/1.0.x-incubating/javascript/container/gadgets.js
URL: 
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/javascript/container/gadgets.js?rev=724916&r1=724915&r2=724916&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/javascript/container/gadgets.js 
(original)
+++ incubator/shindig/branches/1.0.x-incubating/javascript/container/gadgets.js 
Tue Dec  9 14:24:45 2008
@@ -233,7 +233,7 @@
   var url = this.getUrlForView(view);
 
   if (opt_params) {
-    var paramStr = JSON.stringify(opt_params);
+    var paramStr = gadgets.json.stringify(opt_params);
     if (paramStr.length > 0) {
       url += '&appParams=' + encodeURIComponent(paramStr);
     }
@@ -549,7 +549,7 @@
       '&url=' + encodeURIComponent(this.specUrl) +
       '#rpctoken=' + this.rpcToken +
       (this.viewParams ?
-          '&view-params=' +  
encodeURIComponent(JSON.stringify(this.viewParams)) : '') +
+          '&view-params=' +  
encodeURIComponent(gadgets.json.stringify(this.viewParams)) : '') +
       (this.hashData ? '&' + this.hashData : '');
 };