You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by he...@apache.org on 2006/11/14 00:09:37 UTC
svn commit: r474560 [3/3] - in /struts/struts2/trunk/core/src:
main/java/org/apache/struts2/components/
main/java/org/apache/struts2/views/freemarker/tags/
main/java/org/apache/struts2/views/jsp/ui/
main/java/org/apache/struts2/views/velocity/ main/jav...
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js Mon Nov 13 15:09:31 2006
@@ -0,0 +1,162 @@
+dojo.provide("struts.widget.BindDiv");
+
+dojo.require("dojo.io");
+dojo.require("dojo.widget.ContentPane");
+dojo.require("dojo.lang.timing.Timer");
+
+dojo.widget.defineWidget(
+ "struts.widget.BindDiv",
+ dojo.widget.ContentPane, {
+ widgetType : "BindDiv",
+
+ //from ContentPane
+ href : "",
+ extractContent : false,
+ parseContent : false,
+ cacheContent : false,
+ refreshOnShow : false,
+ executeScripts : false,
+
+ //update times
+ updateInterval : 0,
+ delay : 0,
+ autoStart : true,
+ timer : null,
+
+ //messages
+ loadingText : "Loading...",
+ errorText : "",
+
+ //pub/sub events
+ refreshListenTopic : "",
+ stopTimerListenTopic : "",
+ startTimerListenTopic : "",
+
+ //callbacks
+ beforeLoading : "",
+ afterLoading : "",
+
+ formId : "",
+ formFilter : "",
+
+ onDownloadStart : function(event) {
+ if(!dojo.string.isBlank(this.beforeLoading)) {
+ this.log("Executing " + this.beforeLoading);
+ eval(this.beforeLoading);
+ }
+ if(!dojo.string.isBlank(this.loadingText)) {
+ event.text = this.loadingText;
+ }
+ },
+
+ onDownloadError : function(event) {
+ this.onError(event);
+ },
+
+ onContentError : function(event) {
+ this.onError(event);
+ },
+
+ onExecError : function(event) {
+ this.onError(event);
+ },
+
+ onError : function(event) {
+ if(!dojo.string.isBlank(this.errorText)) {
+ event.text = this.errorText;
+ }
+ },
+
+ postCreate : function(args, frag) {
+ var self = this;
+ var hitchedRefresh = function() {
+ dojo.lang.hitch(self, "refresh")();
+ };
+ var hitchedStartTimer = function() {
+ dojo.lang.hitch(self, "startTimer")();
+ };
+
+ if(this.updateInterval > 0) {
+ this.timer = new dojo.lang.timing.Timer(this.updateInterval);
+ this.timer.onTick = hitchedRefresh;
+
+ //start the timer
+ if(this.autoStart) {
+ //start after delay
+ dojo.lang.setTimeout(this.delay, hitchedStartTimer);
+ if(this.delay === 0) {
+ //load content now
+ this.refresh();
+ }
+ }
+ }
+ else {
+ if(this.autoStart) {
+ //start after delay
+ dojo.lang.setTimeout(this.delay, hitchedRefresh);
+ }
+ }
+
+ //attach listeners
+ if(!dojo.string.isBlank(this.refreshListenTopic)) {
+ this.log("Listening to " + this.refreshListenTopic + " to refresh");
+ dojo.event.topic.subscribe(this.refreshListenTopic, this, "refresh");
+ }
+ if(!dojo.string.isBlank(this.stopTimerListenTopic)) {
+ this.log("Listening to " + this.stopTimerListenTopic + " to stop timer");
+ dojo.event.topic.subscribe(this.stopTimerListenTopic, this, "stopTimer");
+ }
+ if(!dojo.string.isBlank(this.startTimerListenTopic)) {
+ this.log("Listening to " + this.startTimerListenTopic + " to start timer");
+ dojo.event.topic.subscribe(this.startTimerListenTopic, this, "startTimer");
+ }
+
+ if(!dojo.string.isBlank(this.afterLoading)) {
+ dojo.event.connect("after", this, "onDownloadEnd", function(){
+ self.log("Executing " + self.afterLoading);
+ eval(self.afterLoading);
+ });
+ }
+ },
+
+ _downloadExternalContent: function(url, useCache) {
+ this._handleDefaults("Loading...", "onDownloadStart");
+ var self = this;
+ dojo.io.bind({
+ url: url,
+ useCache: useCache,
+ preventCache: !useCache,
+ mimetype: "text/html",
+ formNode: dojo.byId(self.formId),
+ formFilter: window[self.formFilter],
+ handler: function(type, data, e) {
+ if(type == "load") {
+ self.onDownloadEnd.call(self, url, data);
+ } else {
+ // works best when from a live server instead of from file system
+ self._handleDefaults.call(self, "Error loading '" + url + "' (" + e.status + " "+ e.statusText + ")", "onDownloadError");
+ self.onLoad();
+ }
+ }
+ });
+ },
+
+ log : function(text) {
+ dojo.debug("[" + this.widgetId + "] " + text);
+ },
+
+ stopTimer : function() {
+ if(this.timer && this.timer.isRunning) {
+ this.log("stopping timer");
+ this.timer.stop();
+ }
+ },
+
+ startTimer : function() {
+ if(this.timer && !this.timer.isRunning) {
+ this.log("starting timer with update interval " + this.updateInterval);
+ this.timer.start();
+ }
+ }
+ }
+);
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js (added)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js Mon Nov 13 15:09:31 2006
@@ -0,0 +1,6 @@
+dojo.kwCompoundRequire({
+ common: ["struts.widget.Bind",
+ "struts.widget.BindDiv",
+ "struts.widget.BindAnchor"]
+});
+dojo.provide("struts.widget.*");
Propchange: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/a.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/a.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/a.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/a.ftl Mon Nov 13 15:09:31 2006
@@ -1,33 +1,4 @@
-<a dojoType="BindAnchor" evalResult="true"<#rt/>
-<#if parameters.id?if_exists != "">
- id="${parameters.id?html}"<#rt/>
-</#if>
-<#if parameters.href?if_exists != "">
- href="${parameters.href}"<#rt/>
-</#if>
-<#if parameters.notifyTopics?exists>
- notifyTopics="${parameters.notifyTopics}"<#rt/>
-</#if>
-<#if parameters.errorText?if_exists != "">
- errorHtml="${parameters.errorText?html}"<#rt/>
-</#if>
-<#if parameters.showErrorTransportText?exists>
- showTransportError="true"<#rt/>
-</#if>
-<#if parameters.afterLoading?exists>
- onLoad="${parameters.afterLoading}"<#rt/>
-</#if>
-<#if parameters.preInvokeJS?exists>
- preInvokeJS="${parameters.preInvokeJS}"<#rt/>
-</#if>
-<#if parameters.tabindex?exists>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
+<a dojoType="struts:BindAnchor"
+ <#include "/${parameters.templateDir}/ajax/ajax-common.ftl" />
+ <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
>
Added: struts/struts2/trunk/core/src/main/resources/template/ajax/ajax-common.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/ajax-common.ftl?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/ajax-common.ftl (added)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/ajax-common.ftl Mon Nov 13 15:09:31 2006
@@ -0,0 +1,54 @@
+ <#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+ </#if>
+ <#if parameters.formId?if_exists != "">
+ formId="${parameters.formId?html}"<#rt/>
+ </#if>
+ <#if parameters.formFilter?if_exists != "">
+ formFilter="${parameters.formFilter?html}"<#rt/>
+ </#if>
+ <#if parameters.tabindex?if_exists != "">
+ tabindex="${parameters.tabindex?html}"<#rt/>
+ </#if>
+ <#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+ </#if>
+ <#if parameters.cssStyle?if_exists != "">
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ <#if parameters.label?if_exists != "">
+ label="${parameters.label?html}"<#rt/>
+ </#if>
+ <#if parameters.title?if_exists != "">
+ title="${parameters.title?html}"<#rt/>
+ </#if>
+ <#if parameters.name?if_exists != "">
+ name="${parameters.name?html}"<#rt/>
+ </#if>
+ <#if parameters.href?if_exists != "">
+ href="${parameters.href}"<#rt/>
+ </#if>
+ <#if parameters.loadingText?if_exists != "">
+ loadingText="${parameters.loadingText?html}"<#rt/>
+ </#if>
+ <#if parameters.errorText?if_exists != "">
+ errorText="${parameters.errorText?html}"<#rt/>
+ </#if>
+ <#if parameters.executeScripts?exists>
+ executeScripts="${parameters.executeScripts?string?html}"<#rt/>
+ </#if>
+ <#if parameters.refreshListenTopic?if_exists != "">
+ refreshListenTopic="${parameters.refreshListenTopic?html}"<#rt/>
+ </#if>
+ <#if parameters.beforeLoading?if_exists != "">
+ beforeLoading="${parameters.beforeLoading?html}"<#rt/>
+ </#if>
+ <#if parameters.afterLoading?if_exists != "">
+ afterLoading="${parameters.afterLoading?html}"<#rt/>
+ </#if>
+ <#if parameters.targets?if_exists != "">
+ targets="${parameters.targets?html}"<#rt/>
+ </#if>
+ <#if parameters.handler?if_exists != "">
+ handler="${parameters.handler?html}"<#rt/>
+ </#if>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/main/resources/template/ajax/ajax-common.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/main/resources/template/ajax/div-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/div-close.ftl?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/div-close.ftl (added)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/div-close.ftl Mon Nov 13 15:09:31 2006
@@ -0,0 +1,6 @@
+</div>
+<#if parameters.updateFreq?if_exists != "">
+ <script language="javascript">
+
+ </script>
+</#if>
Propchange: struts/struts2/trunk/core/src/main/resources/template/ajax/div-close.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl Mon Nov 13 15:09:31 2006
@@ -1,25 +1,19 @@
-<div dojoType='BindDiv'
- <#if parameters.id?if_exists != "">id="${parameters.id?html}"</#if>
- <#if parameters.title?exists>title="${parameters.title?html}"</#if>
- <#if parameters.name?exists>name="${parameters.name?html}"</#if>
- <#if parameters.href?if_exists != "">href="${parameters.href}"</#if>
- <#if parameters.loadingText?if_exists != "">loadingHtml="${parameters.loadingText?html}"</#if>
- <#if parameters.errorText?if_exists != "">errorHtml="${parameters.errorText?html}"</#if>
- <#if parameters.showErrorTransportText?exists>showTransportError='true'</#if>
- <#if parameters.delay?exists>delay='${parameters.delay}'</#if>
- <#if parameters.updateFreq?exists>refresh='${parameters.updateFreq}'</#if>
- <#if parameters.listenTopics?exists>listenTopics='${parameters.listenTopics}'</#if>
- <#if parameters.afterLoading?exists>onLoad='${parameters.afterLoading}'</#if>
- <#if parameters.autoStart?exists>autoStart='${parameters.autoStart}'</#if>
-
-<#if parameters.tabindex?exists>
- tabindex="${parameters.tabindex?html}"<#rt/>
-</#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
-</#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
-</#if>
-<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+<div dojoType="struts:BindDiv"
+ <#if parameters.delay?exists>
+ delay="${parameters.delay?c}"<#rt/>
+ </#if>
+ <#if parameters.updateInterval?exists>
+ updateInterval="${parameters.updateInterval?c}"<#rt/>
+ </#if>
+ <#if parameters.autoStart?exists>
+ autoStart="${parameters.autoStart?string?html}"<#rt/>
+ </#if>
+ <#if parameters.startTimerListenTopic?if_exists != "">
+ startTimerListenTopic="${parameters.startTimerListenTopic?html}"<#rt/>
+ </#if>
+ <#if parameters.stopTimerListenTopic?if_exists != "">
+ stopTimerListenTopic="${parameters.stopTimerListenTopic?html}"<#rt/>
+ </#if>
+ <#include "/${parameters.templateDir}/ajax/ajax-common.ftl" />
+ <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
>
Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js Mon Nov 13 15:09:31 2006
@@ -3,11 +3,10 @@
dojo.hostenv.setModulePrefix('struts', 'struts');
dojo.require('dojo.widget.*');
-dojo.widget.manager.registerWidgetPackage('struts.widgets');
+dojo.widget.manager.registerWidgetPackage('struts.widget');
-dojo.require("struts.widgets.Bind");
-dojo.require("struts.widgets.BindDiv");
-dojo.require("struts.widgets.BindButton");
-dojo.require("struts.widgets.BindAnchor");
+dojo.require("struts.widget.Bind");
+dojo.require("struts.widget.BindDiv");
+dojo.require("struts.widget.BindAnchor");
dojo.require("dojo.widget.Editor");
dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger to work with the includes
Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/submit.ftl Mon Nov 13 15:09:31 2006
@@ -1,7 +1,32 @@
-<#if parameters.resultDivId?exists || parameters.onLoadJS?exists>
-<#include "/${parameters.templateDir}/ajax/submit-ajax.ftl" />
-${tag.addFormParameter("ajaxSubmit", "false")}
+<#if parameters.type?exists && parameters.type=="button">
+ <input type="button" dojoType="struts:Bind" event="onclick"<#rt/>
+ <#include "/${parameters.templateDir}/ajax/ajax-common.ftl"/>
+ <#include "/${parameters.templateDir}/simple/scripting-events.ftl"/>
+ <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
+ <#if parameters.label?if_exists != "">
+ value="${parameters.label?html}"<#rt/>
+ </#if>
+ />
<#else>
-<#--include "/${parameters.templateDir}/xhtml/submit.ftl" /-->
-<#include "/${parameters.templateDir}/${themeProperties.parent}/submit.ftl" />
+ <#if parameters.type?exists && parameters.type=="image">
+ <input type="image" dojoType="struts:Bind" event="onclick"<#rt/>
+ <#if parameters.label?if_exists != "">
+ alt="${parameters.label?html}"<#rt/>
+ </#if>
+ <#if parameters.src?if_exists != "">
+ src="${parameters.src?html}"<#rt/>
+ </#if>
+ <#else>
+ <input type="submit" dojoType="struts:Bind" event="onclick"<#rt/>
+ </#if>
+ <#if parameters.nameValue?if_exists != "">
+ value="${parameters.nameValue?html}"<#rt/>
+ </#if>
+ <#if parameters.value?if_exists != "">
+ value="${parameters.value?html}"<#rt/>
+ </#if>
+ <#include "/${parameters.templateDir}/ajax/ajax-common.ftl"/>
+ <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+ <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
+ />
</#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/tab-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/tab-close.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/tab-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/tab-close.ftl Mon Nov 13 15:09:31 2006
@@ -1,7 +1,13 @@
- </div>
- </div>
-
- <script language="JavaScript" type="text/javascript">
- var tabpanelc_${parameters.id} = new TabContent( "${parameters.id}", ${parameters.remote} );
- dojo.event.topic.subscribe( "${parameters.subscribeTopicName}", tabpanelc_${parameters.id}, "updateVisibility" );
- </script>
+</div>
+<#if parameters.refreshListenTopic?if_exists != "">
+ <script language="javascript">
+ dojo.require("dojo.event.*");
+ dojo.event.topic.subscribe("${parameters.refreshListenTopic}", {
+ refresh: function() {
+ var tabController = dojo.widget.byId("${parameters.id}");
+ if(tabController) {
+ tabController.refresh();
+ }
+ }}, "refresh");
+ </script>
+</#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/tab.ftl Mon Nov 13 15:09:31 2006
@@ -1,17 +1,23 @@
-<div class="tab_contents_hidden" id="tab_contents_${parameters.id}">
- <div class="tab_contents"
- id="tab_contents_update_${parameters.id}"
- <#if parameters.remote?exists>
- dojoType='BindDiv'
- <#if parameters.href?if_exists != "">href="${parameters.href}"</#if>
- <#if parameters.loadingText?if_exists != "">loadingHtml="${parameters.loadingText?html}"</#if>
- <#if parameters.errorText?if_exists != "">errorHtml="${parameters.errorText?html}"</#if>
- <#if parameters.showErrorTransportText?exists>showTransportError='true'</#if>
- delay='1'
- <#if parameters.updateFreq?exists>refresh='${parameters.updateFreq}'</#if>
- <#if parameters.listenTopics?exists>listenTopics='${parameters.listenTopics}'</#if>
- <#if parameters.afterLoading?exists>onLoad='${parameters.afterLoading}'</#if>
- </#if>
- <#if parameters.cssStyle?exists>style="${parameters.cssStyle?html}"</#if>
- <#if parameters.cssClass?exists>class="${parameters.cssClass?html}"</#if>
- >
+<div id="${parameters.id}" cacheContent="false"
+ <#if parameters.title?if_exists != "">
+ label="${parameters.title?html}"<#rt/>
+ </#if>
+ <#if parameters.href?if_exists != "">
+ dojoType="LinkPane" <#rt/>
+ href="${parameters.href}"<#rt/>
+ <#else>
+ dojoType="ContentPane"<#rt/>
+ </#if>
+ <#if parameters.cssStyle?if_exists != "">
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ <#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+ </#if>
+ <#if parameters.closeButton?if_exists != "">
+ closeButton="${parameters.closeButton?html}"<#rt/>
+ </#if>
+ <#if parameters.refreshOnShow?if_exists != "">
+ refreshOnShow="${parameters.refreshOnShow?html}"<#rt/>
+ </#if>
+>
Modified: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/datepicker.ftl Mon Nov 13 15:09:31 2006
@@ -1,4 +1 @@
-<#--include "/${parameters.templateDir}/css_xhtml/controlheader.ftl" /-->
-<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/datepicker.ftl" />
-<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" />
Added: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/dropdowndatetimepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/css_xhtml/dropdowndatetimepicker.ftl?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/css_xhtml/dropdowndatetimepicker.ftl (added)
+++ struts/struts2/trunk/core/src/main/resources/template/css_xhtml/dropdowndatetimepicker.ftl Mon Nov 13 15:09:31 2006
@@ -0,0 +1 @@
+<#include "/${parameters.templateDir}/simple/dropdowndatetimepicker.ftl" />
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/main/resources/template/css_xhtml/dropdowndatetimepicker.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl Mon Nov 13 15:09:31 2006
@@ -1,58 +1,49 @@
<script type="text/javascript">
- dojo.require("dojo.widget.html.DatePicker");
- dojo.require("struts.widgets.*");
+ dojo.require("dojo.widget.DatePicker");
</script>
-<#if parameters.readonly?default(false)>
- <#include "/${parameters.templateDir}/simple/text.ftl" />
-<#else>
-<#--
- <div dojoType="dropdowncontainer"
- dateIconPath="<@s.url includeParams='none' value='/struts/dojo/struts/widgets/dateIcon.gif' encode='false'/>"
- <#if parameters.format?exists>
- dateFormat="${parameters.format}"
- </#if>
- <#if parameters.dateIconPath?exists>
- dateIconPath="${parameters.dateIconPath}"
- </#if>
- <#if parameters.currentDate?exists>
- currentDate="${parameters.currentDate}"
- </#if>
- <#if parameters.currentDate?exists>
- templatePath="${parameters.templatePath}"
- </#if>
- <#if parameters.templateCssPath?exists>
- templateCssPath="${parameters.templateCssPath}"
- </#if>
- <#if parameters.get("size")?exists>
- inputWidth="${parameters.get("size")?html}"
- </#if>
- >
- <#include "/${parameters.templateDir}/simple/text.ftl" />
- </div>
--->
- <div dojoType="dropdowndatepicker"
- <#if parameters.format?exists>
- dateFormat="${parameters.format}"
- </#if>
- <#if parameters.dateIconPath?exists>
- iconPath="${parameters.dateIconPath}"
- <#else>
- iconPath="<@s.url includeParams='none' value='/struts/dojo/struts/widgets/dateIcon.gif' encode='false' includeParams="none" />"
- </#if>
- <#if parameters.nameValue?exists>
- value="${parameters.nameValue?html}"
- </#if>
- <#if parameters.templatePath?exists>
- templatePath="${parameters.templatePath}"
- </#if>
- <#if parameters.templateCssPath?exists>
- templateCssPath="${parameters.templateCssPath}"
- </#if>
- <#if parameters.get("size")?exists>
- inputWidth="${parameters.get("size")?string?html}"
- </#if>
- >
- <#include "/${parameters.templateDir}/simple/text.ftl" />
- </div>
-</#if>
+<div dojoType="datepicker"
+ <#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+ </#if>
+ <#if parameters.value?if_exists != "">
+ value="${parameters.value?html}"<#rt/>
+ </#if>
+ <#if parameters.language?if_exists != "">
+ lang="${parameters.language?html}"<#rt/>
+ </#if>
+ <#if parameters.name?if_exists != "">
+ name="${parameters.name?html}"<#rt/>
+ </#if>
+ <#if parameters.displayWeeks?if_exists != "">
+ displayWeeks="${parameters.displayWeeks?html}"<#rt/>
+ </#if>
+ <#if parameters.adjustWeeks?exists>
+ adjustWeeks="${parameters.adjustWeeks?string?html}"<#rt/>
+ </#if>
+ <#if parameters.startDate?if_exists != "">
+ startDate="${parameters.startDate?html}"<#rt/>
+ </#if>
+ <#if parameters.endDate?if_exists != "">
+ endDate="${parameters.endDate?html}"<#rt/>
+ </#if>
+ <#if parameters.weekStartsOn?if_exists != "">
+ weekStartsOn="${parameters.weekStartsOn?html}"<#rt/>
+ </#if>
+ <#if parameters.staticDisplay?exists>
+ staticDisplay="${parameters.staticDisplay?string?html}"<#rt/>
+ </#if>
+ <#if parameters.dayWidth?if_exists != "">
+ dayWidth="${parameters.dayWidth?html}"<#rt/>
+ </#if>
+ <#if parameters.tabindex?if_exists != "">
+ tabindex="${parameters.tabindex?html}"<#rt/>
+ </#if>
+ <#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+ </#if>
+ <#if parameters.cssStyle?if_exists != "">
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+></div>
\ No newline at end of file
Added: struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl (added)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl Mon Nov 13 15:09:31 2006
@@ -0,0 +1,75 @@
+<script type="text/javascript">
+ <#if parameters.type?if_exists == "date">
+ dojo.require("dojo.widget.DropdownDatePicker");
+ <#else>
+ dojo.require("dojo.widget.DropdownTimePicker");
+ </#if>
+</script>
+<div
+ <#if parameters.type?if_exists == "date">
+ dojoType="dropdowndatepicker"<#rt/>
+ <#else>
+ dojoType="dropdowntimepicker"<#rt/>
+ </#if>
+ <#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+ </#if>
+ <#if parameters.value?if_exists != "">
+ value="${parameters.value?html}"<#rt/>
+ </#if>
+ <#if parameters.language?if_exists != "">
+ lang="${parameters.language?html}"<#rt/>
+ </#if>
+ <#if parameters.name?if_exists != "">
+ inputName="${parameters.name?html}"<#rt/>
+ </#if>
+ <#if parameters.displayWeeks?if_exists != "">
+ displayWeeks="${parameters.displayWeeks?html}"<#rt/>
+ </#if>
+ <#if parameters.adjustWeeks?exists>
+ adjustWeeks="${parameters.adjustWeeks?string?html}"<#rt/>
+ </#if>
+ <#if parameters.startDate?if_exists != "">
+ startDate="${parameters.startDate?html}"<#rt/>
+ </#if>
+ <#if parameters.endDate?if_exists != "">
+ endDate="${parameters.endDate?html}"<#rt/>
+ </#if>
+ <#if parameters.weekStartsOn?if_exists != "">
+ weekStartsOn="${parameters.weekStartsOn?html}"<#rt/>
+ </#if>
+ <#if parameters.staticDisplay?exists>
+ staticDisplay="${parameters.staticDisplay?string?html}"<#rt/>
+ </#if>
+ <#if parameters.dayWidth?if_exists != "">
+ dayWidth="${parameters.dayWidth?html}"<#rt/>
+ </#if>
+ <#if parameters.tabindex?if_exists != "">
+ tabindex="${parameters.tabindex?html}"<#rt/>
+ </#if>
+ <#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+ </#if>
+ <#if parameters.cssStyle?if_exists != "">
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ <#if parameters.iconPath?if_exists != "">
+ iconURL="${parameters.iconPath}"<#rt/>
+ </#if>
+ <#if parameters.formatLength?if_exists != "">
+ formatLength="${parameters.formatLength?html}"<#rt/>
+ </#if>
+ <#if parameters.displayFormat?if_exists != "">
+ displayFormat="${parameters.displayFormat?html}"<#rt/>
+ </#if>
+ <#if parameters.saveFormat?if_exists != "">
+ saveFormat="${parameters.saveFormat?html}"<#rt/>
+ </#if>
+ <#if parameters.toggleType?if_exists != "">
+ containerToggle="${parameters.toggleType?html}"<#rt/>
+ </#if>
+ <#if parameters.toggleDuration?exists>
+ containerToggleDuration="${parameters.toggleDuration?string?html}"<#rt/>
+ </#if>
+ <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+></div>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/main/resources/template/simple/dropdowndatetimepicker.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/tab-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/tab-close.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/tab-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/tab-close.ftl Mon Nov 13 15:09:31 2006
@@ -1,7 +1 @@
- </div>
- </div>
-
- <script language="JavaScript" type="text/javascript">
- var tabpanelc_${parameters.id} = new TabContent( "${parameters.id}", false );
- dojo.event.topic.subscribe( "${parameters.subscribeTopicName}", tabpanelc_${parameters.id}, "updateVisibility" );
- </script>
+</div>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/tab.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/tab.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/tab.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/tab.ftl Mon Nov 13 15:09:31 2006
@@ -1,7 +1,20 @@
-<div class="tab_contents_header" id="tab_contents_${parameters.id}" >
-<div class="tab_contents"
- id="tab_contents_update_${parameters.id}"
- <#if parameters.cssStyle?exists>style="${parameters.cssStyle?html}"</#if>
- <#if parameters.cssClass?exists>class="${parameters.cssClass?html}"</#if>
- <#if parameters.title?exists>title="${parameters.title?html}"</#if>
->
+<div id="${parameters.id}" dojoType="ContentPane"
+ <#if parameters.title?if_exists != "">
+ label="${parameters.title?html}"<#rt/>
+ </#if>
+ <#if parameters.href?if_exists != "">
+ href="${parameters.href}"<#rt/>
+ </#if>
+ <#if parameters.cssStyle?if_exists != "">
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ <#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+ </#if>
+ <#if parameters.closeButton?if_exists != "">
+ closeButton="${parameters.closeButton?html}"<#rt/>
+ </#if>
+ <#if parameters.refreshOnShow?if_exists != "">
+ refreshOnShow="${parameters.refreshOnShow?html}"<#rt/>
+ </#if>
+>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel-close.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel-close.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel-close.ftl Mon Nov 13 15:09:31 2006
@@ -1,14 +1 @@
-<#assign topic = parameters.topicName />
-<#assign tpid = parameters.id />
-<script language="JavaScript" type="text/javascript">
- var headerDiv_${parameters.id} = document.getElementById("tab_header_${parameters.id}");
- var content_${parameters.id} = " <ul class='tab_header_main' id='tab_header_main${parameters.id}'>\n";
- <@s.iterator value="parameters.tabs">
- content_${tpid} = content_${tpid} + " <li onmouseover='mouseIn(this)' onmouseout='mouseOut(this)' class ='tab_default tab_unselected' id='tab_header_${top.id}'>";
- content_${tpid} = content_${tpid} + " <a href='#' onclick='dojo.event.topic.publish(\"${topic}\", \"${top.id}\");return false;'>${top.tabName}</a>";
- content_${tpid} = content_${tpid} + " </li>\n";
- </...@s.iterator>
- content_${parameters.id} = content_${parameters.id} + " </ul>\n";
- headerDiv_${parameters.id}.innerHTML = content_${parameters.id};
- dojo.event.topic.publish('${parameters.topicName}', '${parameters.tabs[0].id}');
-</script>
+</div>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/tabbedpanel.ftl Mon Nov 13 15:09:31 2006
@@ -1 +1,29 @@
-<div class="tab_header" id="tab_header_${parameters.id}" ></div>
+<script type="text/javascript">
+ dojo.require("dojo.widget.TabContainer");
+ dojo.require("dojo.widget.LinkPane");
+ dojo.require("dojo.widget.ContentPane");
+</script>
+
+<div dojoType="TabContainer"
+ <#if parameters.cssStyle?if_exists != "">
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ <#if parameters.id?if_exists != "">
+ style="${parameters.id?html}"<#rt/>
+ </#if>
+ <#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+ </#if>
+ <#if parameters.selectedTab?if_exists != "">
+ selectedTab="${parameters.selectedTab?html}"<#rt/>
+ </#if>
+ <#if parameters.labelPosition?if_exists != "">
+ labelPosition="${parameters.labelPosition?html}"<#rt/>
+ </#if>
+ <#if parameters.closeButton?if_exists != "">
+ closeButton="${parameters.closeButton?html}"<#rt/>
+ </#if>
+ <#if parameters.doLayout?exists>
+ doLayout="${parameters.doLayout?string?html}"<#rt/>
+ </#if>
+>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl Mon Nov 13 15:09:31 2006
@@ -1,33 +1,34 @@
<script type="text/javascript">
- dojo.require("struts.widgets.*");
+ dojo.require("dojo.widget.TimePicker");
</script>
-<#if parameters.readonly?default(false)>
- <#include "/${parameters.templateDir}/simple/text.ftl" />
-<#else>
- <div dojoType="dropdowntimepicker"
- useDefaultTime="false"
- <#if parameters.format?exists>
- timeFormat="${parameters.format}"
- </#if>
- <#if parameters.nameValue?exists>
- value="${parameters.nameValue?html}"
- </#if>
- <#if parameters.timeIconPath?exists>
- iconPath="${parameters.timeIconPath}"
- <#else>
- iconPath="<@s.url includeParams='none' value='/struts/dojo/struts/widgets/timeIcon.gif' encode='false' includeParams="none" />"
- </#if>
- <#if parameters.templatePath?exists>
- templatePath="${parameters.templatePath}"
- </#if>
- <#if parameters.templateCssPath?exists>
- templateCssPath="${parameters.templateCssPath}"
- </#if>
- <#if parameters.get("size")?exists>
- inputWidth="${parameters.get("size")?string?html}"
- </#if>
- >
- <#include "/${parameters.templateDir}/simple/text.ftl" />
- </div>
-</#if>
\ No newline at end of file
+<div dojoType="timepicker"
+ <#if parameters.id?if_exists != "">
+ id="${parameters.id?html}"<#rt/>
+ </#if>
+ <#if parameters.value?if_exists != "">
+ storedTime="todayT${parameters.value?html}"<#rt/>
+ </#if>
+ <#if parameters.language?if_exists != "">
+ lang="${parameters.language?html}"<#rt/>
+ </#if>
+ <#if parameters.name?if_exists != "">
+ name="${parameters.name?html}"<#rt/>
+ </#if>
+ <#if parameters.tabindex?if_exists != "">
+ tabindex="${parameters.tabindex?html}"<#rt/>
+ </#if>
+ <#if parameters.cssClass?if_exists != "">
+ class="${parameters.cssClass?html}"<#rt/>
+ </#if>
+ <#if parameters.cssStyle?if_exists != "">
+ style="${parameters.cssStyle?html}"<#rt/>
+ </#if>
+ <#if parameters.useDefaultMinutes?exists>
+ useDefaultMinutes="${parameters.useDefaultMinutes?string}"<#rt/>
+ </#if>
+ <#if parameters.useDefaultTime?exists>
+ useDefaultTime="${parameters.useDefaultTime?string}"<#rt/>
+ </#if>
+ <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
+></div>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/datepicker.ftl Mon Nov 13 15:09:31 2006
@@ -1,3 +1,2 @@
-<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/datepicker.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+
Modified: struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl Mon Nov 13 15:09:31 2006
@@ -1,3 +1,2 @@
-<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" />
<#include "/${parameters.templateDir}/simple/timepicker.ftl" />
-<#include "/${parameters.templateDir}/xhtml/controlfooter.ftl" />
+
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/components/UIComponentTest.java Mon Nov 13 15:09:31 2006
@@ -22,6 +22,7 @@
import org.apache.struts2.TestConfigurationProvider;
import org.apache.struts2.views.jsp.AbstractUITagTest;
+import org.apache.struts2.views.jsp.ui.AbstractRemoteCallUITag;
import org.apache.struts2.views.jsp.ui.ActionErrorTag;
import org.apache.struts2.views.jsp.ui.ActionMessageTag;
import org.apache.struts2.views.jsp.ui.AnchorTag;
@@ -177,7 +178,7 @@
try {
t.doStartTag();
- DivTag tag = new DivTag();
+ AbstractRemoteCallUITag tag = new DivTag();
tag.setPageContext(pageContext);
tag.doStartTag();
assertEquals(tag.getComponent().getComponentStack().peek(), tag.getComponent());
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/AbstractUITagTest.java Mon Nov 13 15:09:31 2006
@@ -234,7 +234,7 @@
while (it.hasNext()) {
PropertyHolder propertyHolder = (PropertyHolder) it.next();
if (! excludeList.contains(propertyHolder.getName())) {
- assertTrue("Expected to find: " + propertyHolder.getExpectation(), writerString.indexOf(propertyHolder.getExpectation()) > -1);
+ assertTrue("Expected to find: " + propertyHolder.getExpectation() + " in resulting String: " + writerString, writerString.indexOf(propertyHolder.getExpectation()) > -1);
}
}
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AnchorTest.java Mon Nov 13 15:09:31 2006
@@ -40,9 +40,12 @@
tag.setTheme("ajax");
tag.setHref("a");
tag.setErrorText("c");
- tag.setShowErrorTransportText("true");
- tag.setNotifyTopics("g");
- tag.setAfterLoading("h");
+ tag.setLoadingText("d");
+ tag.setAfterLoading("e");
+ tag.setBeforeLoading("f");
+ tag.setRefreshListenTopic("g");
+ tag.setTargets("h");
+ tag.setHandler("i");
tag.doStartTag();
tag.doEndTag();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DatePickerTagTest.java Mon Nov 13 15:09:31 2006
@@ -20,82 +20,49 @@
*/
package org.apache.struts2.views.jsp.ui;
-import java.util.Locale;
-
import org.apache.struts2.views.jsp.AbstractUITagTest;
-import com.opensymphony.xwork2.ActionContext;
/**
- * Unit test for {@link DatePickerTag}.
- *
*/
public class DatePickerTagTest extends AbstractUITagTest {
- private DatePickerTag tag;
-
- public void testDefault() throws Exception {
- tag.doStartTag();
- tag.doEndTag();
- verify(DatePickerTagTest.class.getResource("DatePickerTagTest-1.txt"));
+ public void testGenericSimple() throws Exception {
+ AbstractRemoteCallUITag tag = new DivTag();
+ verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
}
- public void testLocaleInStack() throws Exception {
- stack.getContext().put(ActionContext.LOCALE, Locale.FRANCE);
-
- tag.doStartTag();
- tag.doEndTag();
-
- verify(DatePickerTagTest.class.getResource("DatePickerTagTest-2.txt"));
+ public void testGenericXhtml() throws Exception {
+ AbstractRemoteCallUITag tag = new DivTag();
+ verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
}
- public void testFormat() throws Exception {
- tag.setFormat("#yyyy/#MM/#dd #hh:#mm:#ss");
-
- tag.doStartTag();
- tag.doEndTag();
- assertTrue("Should contain format", writer.toString().indexOf("#yyyy/#MM/#dd #hh:#mm:#ss") > -1);
+ public void testGenericAjax() throws Exception {
+ AbstractRemoteCallUITag tag = new DivTag();
+ verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
}
- // NOTE: Switching to Dojo's DatePicker, i18n is not supported,
- // Commenting out this test case
- /*public void testLanguage() throws Exception {
- tag.setLanguage("da");
-
- tag.doStartTag();
- tag.doEndTag();
- assertTrue("Should contain danish language", writer.toString().indexOf("/struts/jscalendar/lang/calendar-da.js") > -1);
- }*/
-
-
- // NOTE: Switching to Dojo's DatePicker, showing time is not supported.
- // Commenting this test case
- /*public void testShowstime() throws Exception {
- tag.setShowstime("24");
-
- tag.doStartTag();
- tag.doEndTag();
- assertTrue("Should contain showsTime 24", writer.toString().indexOf("showsTime : \"24\"") > -1);
- }*/
+ public void testSimple() throws Exception {
+ DatePickerTag tag = new DatePickerTag();
+ tag.setPageContext(pageContext);
- // NOTE: Switching to Dojo's DatePickuer, single / double click to popup
- // is not supported. Commenting out this test case.
- /*public void testSingleclick() throws Exception {
- tag.setSingleclick("true");
+ tag.setId("id");
+ tag.setTheme("ajax");
+ tag.setAdjustWeeks("true");
+ tag.setDayWidth("b");
+ tag.setDisplayWeeks("true");
+ tag.setEndDate("d");
+ tag.setStartDate("e");
+ tag.setStaticDisplay("false");
+ tag.setWeekStartsOn("g");
+ tag.setName("h");
+ tag.setLanguage("i");
tag.doStartTag();
tag.doEndTag();
- }*/
-
- protected void setUp() throws Exception {
- super.setUp();
- tag = new DatePickerTag();
- tag.setPageContext(pageContext);
- }
- protected void tearDown() throws Exception {
- super.tearDown();
+ verify(DatePickerTagTest.class.getResource("DatePickerTagTest-1.txt"));
}
}
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DivTest.java Mon Nov 13 15:09:31 2006
@@ -30,17 +30,17 @@
public void testGenericSimple() throws Exception {
- DivTag tag = new DivTag();
+ AbstractRemoteCallUITag tag = new DivTag();
verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
}
public void testGenericXhtml() throws Exception {
- DivTag tag = new DivTag();
+ AbstractRemoteCallUITag tag = new DivTag();
verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
}
public void testGenericAjax() throws Exception {
- DivTag tag = new DivTag();
+ AbstractRemoteCallUITag tag = new DivTag();
verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
}
@@ -56,12 +56,16 @@
tag.setHref("a");
tag.setLoadingText("b");
tag.setErrorText("c");
- tag.setShowErrorTransportText("true");
+ tag.setAutoStart("true");
tag.setDelay("4000");
- tag.setUpdateFreq("1000");
- tag.setListenTopics("g");
- tag.setAfterLoading("h");
-
+ tag.setUpdateInterval("1000");
+ tag.setRefreshListenTopic("g");
+ tag.setStartTimerListenTopic("h");
+ tag.setStopTimerListenTopic("i");
+ tag.setBeforeLoading("j");
+ tag.setAfterLoading("k");
+ tag.setRefreshOnShow("true");
+ tag.setHandler("l");
tag.doStartTag();
tag.doEndTag();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/SubmitAjaxTest.java Mon Nov 13 15:09:31 2006
@@ -1,25 +1,23 @@
/*
* $Id$
*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Copyright 2006 The Apache Software Foundation.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.struts2.views.jsp.ui;
+import org.apache.struts2.TestAction;
import org.apache.struts2.views.jsp.AbstractUITagTest;
/**
@@ -27,21 +25,91 @@
*/
public class SubmitAjaxTest extends AbstractUITagTest {
- public void testSimple() throws Exception {
+ public void testGenericSimple() throws Exception {
+ AbstractRemoteCallUITag tag = new DivTag();
+ verifyGenericProperties(tag, "simple", new String[]{"value","tabindex","disabled"});
+ }
+
+ public void testGenericXhtml() throws Exception {
+ AbstractRemoteCallUITag tag = new DivTag();
+ verifyGenericProperties(tag, "xhtml", new String[]{"value","tabindex","disabled"});
+ }
+
+ public void testGenericAjax() throws Exception {
+ AbstractRemoteCallUITag tag = new DivTag();
+ verifyGenericProperties(tag, "ajax", new String[]{"value","tabindex","disabled"});
+ }
+
+ public void testSubmit() throws Exception {
+ TestAction testAction = (TestAction) action;
+ testAction.setFoo("bar");
+
SubmitTag tag = new SubmitTag();
tag.setPageContext(pageContext);
- tag.setId("mylink");
- tag.setValue("submit");
+ tag.setId("a");
tag.setTheme("ajax");
- tag.setResultDivId("formId");
- tag.setOnLoadJS("alert('form submitted');");
- tag.setListenTopics("a");
- tag.setNotifyTopics("b");
+ tag.setHref("b");
+ tag.setLoadingText("c");
+ tag.setErrorText("d");
+ tag.setRefreshListenTopic("e");
+ tag.setBeforeLoading("f");
+ tag.setAfterLoading("g");
+ tag.setHandler("h");
+ tag.setType("submit");
+ tag.setLabel("i");
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(DivTest.class.getResource("submit-ajax-1.txt"));
+ }
+ public void testButton() throws Exception {
+ TestAction testAction = (TestAction) action;
+ testAction.setFoo("bar");
+
+ SubmitTag tag = new SubmitTag();
+ tag.setPageContext(pageContext);
+
+ tag.setId("a");
+ tag.setTheme("ajax");
+ tag.setHref("b");
+ tag.setLoadingText("c");
+ tag.setErrorText("d");
+ tag.setRefreshListenTopic("e");
+ tag.setBeforeLoading("f");
+ tag.setAfterLoading("g");
+ tag.setHandler("h");
+ tag.setType("button");
+ tag.setLabel("i");
+ tag.doStartTag();
+ tag.doEndTag();
+
+ verify(DivTest.class.getResource("submit-ajax-2.txt"));
+ }
+
+ public void testImage() throws Exception {
+ TestAction testAction = (TestAction) action;
+ testAction.setFoo("bar");
+
+ SubmitTag tag = new SubmitTag();
+ tag.setPageContext(pageContext);
+
+ tag.setId("a");
+ tag.setTheme("ajax");
+ tag.setHref("b");
+ tag.setLoadingText("c");
+ tag.setErrorText("d");
+ tag.setRefreshListenTopic("e");
+ tag.setBeforeLoading("f");
+ tag.setAfterLoading("g");
+ tag.setHandler("h");
+ tag.setType("image");
+ tag.setLabel("i");
+ tag.setSrc("j");
tag.doStartTag();
tag.doEndTag();
- verify(AnchorTest.class.getResource("submit-ajax-1.txt"));
+ verify(DivTest.class.getResource("submit-ajax-3.txt"));
}
}
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DatePickerTagTest-1.txt Mon Nov 13 15:09:31 2006
@@ -1,15 +1,14 @@
-<tr>
- <td class="tdLabel"></td>
- <td>
<script type="text/javascript">
- dojo.require("dojo.widget.html.DatePicker");
- dojo.require("struts.widgets.*");
+ dojo.require("dojo.widget.DatePicker");
</script>
-
- <div dojoType="dropdowndatepicker"
- iconPath="/struts/dojo/struts/widgets/dateIcon.gif"
- >
-<input type="text" name="" id=""/>
- </div>
-</td>
-</tr>
+<div dojoType="datepicker"
+ id="id"
+ lang="i"
+ name="h"
+ displayWeeks="true"
+ adjustWeeks="true"
+ startDate="e"
+ endDate="d"
+ weekStartsOn="g"
+ staticDisplay="false">
+</div>
\ No newline at end of file
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropDownTimePicker-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropDownTimePicker-1.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropDownTimePicker-1.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropDownTimePicker-1.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,21 @@
+<script type="text/javascript">
+ dojo.require("dojo.widget.DropdownTimePicker");
+</script>
+<div dojoType="dropdowntimepicker"
+ id="id"
+ value="n"
+ lang="i"
+ inputName="h"
+ displayWeeks="true"
+ adjustWeeks="true"
+ startDate="e"
+ endDate="d"
+ weekStartsOn="g"
+ staticDisplay="false"
+ iconURL="j"
+ formatLength="k"
+ displayFormat="l"
+ saveFormat="m"
+ containerToggle="o"
+ containerToggleDuration="100">
+</div>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropDownTimePicker-1.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropdownDatePicker-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropdownDatePicker-1.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropdownDatePicker-1.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropdownDatePicker-1.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,21 @@
+<script type="text/javascript">
+ dojo.require("dojo.widget.DropdownDatePicker");
+</script>
+<div dojoType="dropdowndatepicker"
+ id="id"
+ value="n"
+ lang="i"
+ inputName="h"
+ displayWeeks="true"
+ adjustWeeks="true"
+ startDate="e"
+ endDate="d"
+ weekStartsOn="g"
+ staticDisplay="false"
+ iconURL="j"
+ formatLength="k"
+ displayFormat="l"
+ saveFormat="m"
+ containerToggle="o"
+ containerToggleDuration="100">
+</div>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/DropdownDatePicker-1.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-1.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-1.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-1.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,12 @@
+<script type="text/javascript">
+ dojo.require("dojo.widget.TabContainer");
+ dojo.require("dojo.widget.LinkPane");
+ dojo.require("dojo.widget.ContentPane");
+</script>
+<div
+ dojoType="TabContainer"
+ selectedTab="a"
+ labelPosition="b"
+ closeButton="c"
+ doLayout="true">
+</div>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-1.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-2.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-2.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-2.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,9 @@
+<script type="text/javascript">
+ dojo.require("dojo.widget.TabContainer");
+ dojo.require("dojo.widget.LinkPane");
+ dojo.require("dojo.widget.ContentPane");
+</script>
+<div
+ dojoType="TabContainer"
+ doLayout="false">
+</div>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-2.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-3.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-3.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-3.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-3.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+ dojo.require("dojo.widget.TabContainer");
+ dojo.require("dojo.widget.LinkPane");
+ dojo.require("dojo.widget.ContentPane");
+</script>
+<div
+ dojoType="TabContainer"
+ labelPosition="right-h"
+ doLayout="true">
+</div>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-3.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-4.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-4.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-4.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-4.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,10 @@
+<script type="text/javascript">
+ dojo.require("dojo.widget.TabContainer");
+ dojo.require("dojo.widget.LinkPane");
+ dojo.require("dojo.widget.ContentPane");
+</script>
+<div
+ dojoType="TabContainer"
+ labelPosition="left-h"
+ doLayout="false">
+</div>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TabbedPanel-4.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TimePicker-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TimePicker-1.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TimePicker-1.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TimePicker-1.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,12 @@
+<script type="text/javascript">
+ dojo.require("dojo.widget.TimePicker");
+</script>
+<div
+ dojoType="timepicker"
+ id="id"
+ storedTime="todayTc"
+ lang="b"
+ name="a"
+ useDefaultMinutes="true"
+ useDefaultTime="false">
+</div>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/TimePicker-1.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/div-1.txt Mon Nov 13 15:09:31 2006
@@ -1,12 +1,16 @@
-<div dojoType='BindDiv'
- id="mylabel"
- href="a"
- loadingHtml="b"
- errorHtml="c"
- showTransportError='true'
- delay='4000'
- refresh='1000'
- listenTopics='g'
- onLoad='h'
-
-></div>
+<div
+ dojoType="struts:BindDiv"
+ delay="4000"
+ updateInterval="1000"
+ autoStart="true"
+ startTimerListenTopic="h"
+ stopTimerListenTopic="i"
+ id="mylabel"
+ href="a"
+ loadingText="b"
+ errorText="c"
+ refreshListenTopic="g"
+ beforeLoading="j"
+ afterLoading="k"
+ handler="l">
+</div>
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/href-1.txt Mon Nov 13 15:09:31 2006
@@ -1 +1,12 @@
-<a dojoType="BindAnchor" evalResult="true" id="mylink" href="a" notifyTopics="g" errorHtml="c" showTransportError="true" onLoad="h"></a>
+<a
+ dojoType="struts:BindAnchor"
+ id="mylink"
+ href="a"
+ loadingText="d"
+ errorText="c"
+ refreshListenTopic="g"
+ beforeLoading="f"
+ afterLoading="e"
+ targets="h"
+ handler="i">
+</a>
\ No newline at end of file
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt?view=diff&rev=474560&r1=474559&r2=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-1.txt Mon Nov 13 15:09:31 2006
@@ -1 +1,14 @@
-<tr> <td class="tdLabel"></td><td align="right"><button type="submit" dojoType="BindButton" value="submit" targetDiv="formId" onLoad="alert('form submitted');" notifyTopics="b" listenTopics="a">submit</button></td> </tr>
+<input
+ type="submit"
+ dojoType="struts:Bind"
+ event="onclick"
+ value="Submit"
+ id="a"
+ label="i"
+ href="b"
+ loadingText="c"
+ errorText="d"
+ refreshListenTopic="e"
+ beforeLoading="f"
+ afterLoading="g"
+ handler="h"/>
\ No newline at end of file
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,14 @@
+<input
+ type="button"
+ dojoType="struts:Bind"
+ event="onclick"
+ id="a"
+ label="i"
+ href="b"
+ loadingText="c"
+ errorText="d"
+ refreshListenTopic="e"
+ beforeLoading="f"
+ afterLoading="g"
+ handler="h"
+ value="i"/>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt?view=auto&rev=474560
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt (added)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt Mon Nov 13 15:09:31 2006
@@ -0,0 +1,16 @@
+<input
+ type="image"
+ dojoType="struts:Bind"
+ event="onclick"
+ alt="i"
+ src="j"
+ value="Submit"
+ id="a"
+ label="i"
+ href="b"
+ loadingText="c"
+ errorText="d"
+ refreshListenTopic="e"
+ beforeLoading="f"
+ afterLoading="g"
+ handler="h"/>
\ No newline at end of file
Propchange: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt
------------------------------------------------------------------------------
svn:eol-style = native