Commits

Anonymous committed b9a9d5c

- reverted ajax head.ftl back (SAF simple theme uses dojo but WW does not, so the backporting wouldn't work)
- fixed failing test.

Issue number: WW-1304
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@2640573baa09-0c28-0410-bef9-dab3c582ae83

  • Participants
  • Parent commits aa2e204

Comments (0)

Files changed (3)

File src/java/template/ajax/head.ftl

-<#--include "/${parameters.templateDir}/xhtml/head.ftl" /-->
-<#include "/${parameters.templateDir}/${themeProperties.parent}/head.ftl" />
+<#include "/${parameters.templateDir}/xhtml/head.ftl" />
+<script language="JavaScript" type="text/javascript">
+    // Dojo configuration
+    djConfig = {
+        baseRelativePath: "<@ww.url includeParams='none' value='/webwork/dojo/' encode='false'/>",
+        isDebug: ${parameters.debug},
+        bindEncoding: "${parameters.encoding}",
+        debugAtAllCosts: true // not needed, but allows the Venkman debugger to work with the includes
+    };
+</script>
+<script language="JavaScript" type="text/javascript"
+        src="<@ww.url includeParams='none' value='/webwork/dojo/dojo.js' encode='false'/>"></script>
 <script language="JavaScript" type="text/javascript"
         src="<@ww.url includeParams='none' value='/webwork/ajax/dojoRequire.js' encode='false'/>"></script>
 <script language="JavaScript" type="text/javascript"

File src/java/template/ajax/submit-ajax.ftl

  listenTopics="${parameters.listenTopics}"<#rt/>
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
-><#if parameters.nameValue?exists><@ww.property value="parameters.nameValue"/><#rt/></#if></button></div>
+><#if parameters.nameValue?exists><@ww.property value="parameters.nameValue"/><#rt/></#if></button>
 <#--include "/${parameters.templateDir}/xhtml/controlfooter.ftl" /-->
 <#include "/${parameters.templateDir}/${themeProperties.parent}/controlfooter.ftl" />
 

File src/test/com/opensymphony/webwork/views/jsp/ui/submit-ajax-1.txt

-<tr> <td colspan="2"><div align="right"><button type="submit" dojoType="BindButton" value="submit" targetDiv="formId" onLoad="alert('form submitted');" notifyTopics="b" listenTopics="a">submit</button></div> </td> </tr>
+<tr> <td class="tdLabel"></td><td><button type="submit" dojoType="BindButton" value="submit" targetDiv="formId" onLoad="alert('form submitted');" notifyTopics="b" listenTopics="a">submit</button></td> </tr>