Author: musachy
Date: Fri Sep 28 11:18:02 2007
New Revision: 580449
URL: http://svn.apache.org/viewvc?rev=580449&view=rev
Log:
WW-2017 dojo.hostenv.writeIncludes should pass the true parameter
* dojo.hostenv.writeIncludes will only be included if debug="true" on head tag
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js?rev=580449&r1=580448&r2=580449&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/dojoRequire.js
Fri Sep 28 11:18:02 2007
@@ -28,4 +28,3 @@
dojo.require("struts.widget.*");
dojo.require("dojo.widget.Editor2");
-dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger
to work with the includes
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl?rev=580449&r1=580448&r2=580449&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
(original)
+++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/head.ftl
Fri Sep 28 11:18:02 2007
@@ -69,7 +69,13 @@
<script language="JavaScript" type="text/javascript"
src="${base}/struts/ajax/dojoRequire.js"></script>
+<#if parameters.debug?default(false)>
+<script language="JavaScript" type="text/javascript">
+ dojo.hostenv.writeIncludes(true);
+</script>
+</#if>
<link rel="stylesheet" href="${base}/struts/xhtml/styles.css" type="text/css"/>
+
<script language="JavaScript" src="${base}/struts/utils.js"
type="text/javascript"></script>
<script language="JavaScript" src="${base}/struts/xhtml/validation.js"
type="text/javascript"></script>
<script language="JavaScript" src="${base}/struts/css_xhtml/validation.js"
type="text/javascript"></script>
Modified:
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt?rev=580449&r1=580448&r2=580449&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/HeadTagTest-1.txt
Fri Sep 28 11:18:02 2007
@@ -21,6 +21,10 @@
<script language="JavaScript" type="text/javascript"
src="/struts/ajax/dojoRequire.js">
</script>
+<script language="JavaScript" type="text/javascript">
+ dojo.hostenv.writeIncludes(true);
+</script>
+
<link rel="stylesheet" href="/struts/xhtml/styles.css" type="text/css"/>
<script language="JavaScript" src="/struts/utils.js" type="text/javascript">
