WW-2077 Change parseWidgets to false in djConfig inside head FTL .Should be false for better performance!

* Now there is a new property "parseContent" in the "head" tag, which is set to "false" by default. If set to true, Dojo will scan the whole document looking for widgets. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@569863 13f79535-47bb-0310-9956-ffa450edef68
2026-08-31 19:35:40 +00:00 · 2007-08-26 19:18:15 +00:00
parent 168bf5e8ab
commit add167aefd
42 changed files with 2771 additions and 2590 deletions
@@ -35,6 +35,7 @@ import org.apache.struts2.dispatcher.Dispatcher;
 import org.apache.struts2.dispatcher.RequestMap;
 import org.apache.struts2.dispatcher.SessionMap;
 import org.apache.struts2.dojo.TestAction;
+import org.apache.struts2.dojo.components.Head;

 import com.mockobjects.dynamic.Mock;
 import com.opensymphony.xwork2.Action;
@@ -85,6 +86,7 @@ public abstract class AbstractTagTest extends StrutsTestCase {
        stack = ValueStackFactory.getFactory().createValueStack();
        context = stack.getContext();
        stack.push(action);
+        context.put(Head.PARSE_CONTENT, false);

        request = new StrutsMockHttpServletRequest();
        request.setAttribute(ServletActionContext.STRUTS_VALUESTACK_KEY, stack);
@@ -38,6 +38,7 @@ public class AutocompleterTest extends AbstractUITagTest {
        tag.setSearchType("b");
        tag.setDisabled("c");
        tag.setName("f");
+        tag.setId("f");
        tag.setValue("g");
        tag.setIndicator("h");
        tag.setKeyName("i");
@@ -70,6 +71,7 @@ public class AutocompleterTest extends AbstractUITagTest {
        tag.setSearchType("b");
        tag.setDisabled("c");
        tag.setName("f");
+        tag.setId("f");
        tag.setIconPath("i");
        tag.setTemplateCssPath("j");
        tag.setValueNotifyTopics("k");
@@ -21,6 +21,7 @@
 package org.apache.struts2.dojo.views.jsp.ui;

 import org.apache.struts2.dojo.TestAction;
+import org.apache.struts2.dojo.components.Head;


 /**
@@ -40,6 +40,7 @@ public class HeadTagTest extends AbstractUITagTest {
        tag.setBaseRelativePath("/path");
        tag.setLocale("es");
        tag.setCache("true");
+        tag.setParseContent("true");
        tag.doStartTag();
        tag.doEndTag();

@@ -28,7 +28,7 @@ public class TabbedPanelTagTest extends AbstractUITagTest {
    public void testSimple() throws Exception {
        TabbedPanelTag tag = new TabbedPanelTag();
        tag.setPageContext(pageContext);
-
+        tag.setId("a");
        tag.doStartTag();
        tag.doEndTag();

@@ -23,3 +23,4 @@
 transport="m"
 preload="true"
 />
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("f");</script>
@@ -18,3 +18,4 @@
 	<option value="d">d</option>
 	<option value="e">e</option>
 </select>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("f");</script>
@@ -25,4 +25,5 @@
 			"parseContent" : false
 		});
 	});
-</script>
+</script>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
@@ -14,4 +14,5 @@
     valueNotifyTopics="k"
     saveFormat="rfc">
 </div>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("id");</script>

@@ -10,7 +10,8 @@
 			"a",
 			"b",
 			"c"
-		]
+		],
+		parseWidgets: true
 		};
 </script>

@@ -1,32 +1,33 @@
-<script language="JavaScript" type="text/javascript">
-	// Dojo configuration
-	djConfig={
-		isDebug: false,
-		bindEncoding: "ISO-8859-1",
-		baseRelativePath: "/struts/dojo/",
-		baseScriptUri: "/struts/dojo/",
-		locale: "es",
-		extraLocale: [
-			"a",
-			"b",
-			"c"
-		]
-		};
-</script>
-
-<script language="JavaScript" type="text/javascript" src="/struts/dojo/dojo.js">
-</script>
-
-<script language="JavaScript" type="text/javascript" src="/struts/ajax/dojoRequire.js">
-</script>
-
-<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
-
-<script language="JavaScript" src="/struts/utils.js" type="text/javascript">
-</script>
-
-<script language="JavaScript" src="/struts/xhtml/validation.js" type="text/javascript">
-</script>
-
-<script language="JavaScript"src="/struts/css_xhtml/validation.js" type="text/javascript">
+<script language="JavaScript" type="text/javascript">
+	// Dojo configuration
+	djConfig={
+		isDebug: false,
+		bindEncoding: "ISO-8859-1",
+		baseRelativePath: "/struts/dojo/",
+		baseScriptUri: "/struts/dojo/",
+		locale: "es",
+		extraLocale: [
+			"a",
+			"b",
+			"c"
+		],
+		parseWidgets: false
+		};
+</script>
+
+<script language="JavaScript" type="text/javascript" src="/struts/dojo/dojo.js">
+</script>
+
+<script language="JavaScript" type="text/javascript" src="/struts/ajax/dojoRequire.js">
+</script>
+
+<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
+
+<script language="JavaScript" src="/struts/utils.js" type="text/javascript">
+</script>
+
+<script language="JavaScript" src="/struts/xhtml/validation.js" type="text/javascript">
+</script>
+
+<script language="JavaScript"src="/struts/css_xhtml/validation.js" type="text/javascript">
 </script>
@@ -1,5 +1,7 @@
 <linkrel="stylesheet" href="/struts/TabbedPanel.css" type="text/css"/>
 <div
  dojoType="struts:StrutsTabContainer"
+  id="a"
  doLayout="false">
 </div>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
@@ -14,4 +14,5 @@ dojo.addOnLoad(function(){
 });
 </script>
 <div dojoType="struts:StrutsTabContainer" id="foo" doLayout="false">
-</div>
+</div>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("foo");</script>
@@ -10,4 +10,5 @@ dojo.addOnLoad(function(){
 });
 </script>
 <div dojoType="struts:StrutsTabContainer" id="foo" selectedTab="bar" doLayout="false">
-</div>
+</div>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("foo");</script>
@@ -25,3 +25,4 @@
  transport="q"
  parseContent="false">
 </div>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("mylabel");</script>
@@ -22,3 +22,4 @@
 transport="o"
 parseContent="false">
 </a>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("mylink");</script>
@@ -25,3 +25,4 @@
  transport="p"
  parseContent="false"
  />
+  <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
@@ -17,4 +17,5 @@
  indicator="l"
  scriptSeparation="true"
  value="i"
-  />
+  />
+  <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
@@ -20,4 +20,5 @@
  handler="h"
  indicator="l"
  scriptSeparation="true"
-  />
+  />
+  <script language="JavaScript" type="text/javascript">djConfig.searchIds.push("a");</script>
@@ -39,4 +39,9 @@
 	    id="child3"
    title="Child 4">
 </div>
-</div></div>
+</div></div>
+<script language="JavaScript" type="text/javascript">
+   djConfig.searchIds.push("treeSelector_rootId");
+   djConfig.searchIds.push("rootId");
+   djConfig.searchIds.push("child1","child1","child2","gChild1","gChild1","gChild2","gChild2","gChild3","gChild3","child2","child3","child3");
+</script>
@@ -61,4 +61,8 @@
 </div>
 </div>
 </div>
-</div>
+</div>
+<script language="JavaScript" type="text/javascript">
+    djConfig.searchIds.push("treeSelector_myTree");
+    djConfig.searchIds.push("myTree");
+</script>