svn commit: r578345 - in /tapestry/tapestry4/trunk/tapestry-framework/src: java/org/apache/tapestry/dojo/AjaxShellDelegate.java test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java

[andyhot]

Author: andyhot
Date: Fri Sep 21 18:21:32 2007
New Revision: 578345

URL: http://svn.apache.org/viewvc?rev=578345&view=rev
Log:
TAPESTRY-1430: but tread the searchIds as a json literal

Modified:
    
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
    
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java?rev=578345&r1=578344&r2=578345&view=diff
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
 Fri Sep 21 18:21:32 2007
@@ -16,6 +16,7 @@
 import org.apache.hivemind.util.Defense;
 import org.apache.tapestry.*;
 import org.apache.tapestry.html.Shell;
+import org.apache.tapestry.json.JSONLiteral;
 import org.apache.tapestry.json.JSONObject;
 
 import java.util.Locale;
@@ -110,7 +111,7 @@
         
         dojoConfig.put("parseWidgets", _parseWidgets);
         if (_searchIds != null)
-            dojoConfig.put("searchIds", _searchIds);
+            dojoConfig.put("searchIds", new JSONLiteral(_searchIds));
 
         // Supports setting up locale in dojo environment to match the 
requested page locale.
         // (for things that use these settings, like DropdownDatePicker / date 
parsing / etc..

Modified: 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java?rev=578345&r1=578344&r2=578345&view=diff
==============================================================================
--- 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
 (original)
+++ 
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
 Fri Sep 21 18:21:32 2007
@@ -146,7 +146,7 @@
         d.setDebug(true);
         d.setLogLevel(AjaxShellDelegate.BROWSER_LOG_DEBUG);
         d.setConsoleEnabled(true);
-        d.setSearchIds("treeId");
+        d.setSearchIds("['treeId']");
         
         replay();
         
@@ -155,7 +155,7 @@
         verify();
         
         assertBuffer("<script type=\"text/javascript\">djConfig = 
{\"isDebug\":true,\"baseRelativePath\":\"http:///dojo/path\","; +
-                     
"\"parseWidgets\":false,\"searchIds\":\"treeId\",\"locale\":\"en-gb\"} 
</script>" + SYSTEM_NEWLINE +
+                     
"\"parseWidgets\":false,\"searchIds\":['treeId'],\"locale\":\"en-gb\"} 
</script>" + SYSTEM_NEWLINE +
                      SYSTEM_NEWLINE +
                      "<script type=\"text/javascript\" 
src=\"http:///dojo/path/dojo.js\";></script>" + SYSTEM_NEWLINE +
                      "<script type=\"text/javascript\">" + SYSTEM_NEWLINE +