You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/12/24 23:46:08 UTC
svn commit: r490079 [2/2] - in /struts/struts2/trunk:
apps/showcase/src/main/webapp/ajax/autocompleter/
apps/showcase/src/main/webapp/ajax/remotebutton/
apps/showcase/src/main/webapp/ajax/remotediv/
apps/showcase/src/main/webapp/ajax/remotelink/ apps/s...
Modified: 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=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js Sun Dec 24 14:46:07 2006
@@ -18,7 +18,7 @@
executeScripts : false,
//update times
- updateInterval : 0,
+ updateFreq : 0,
delay : 0,
autoStart : true,
timer : null,
@@ -28,9 +28,11 @@
errorText : "",
//pub/sub events
- refreshListenTopic : "",
- stopTimerListenTopic : "",
- startTimerListenTopic : "",
+ listenTopics : "",
+ notifyTopics : "",
+ notifyTopicsArray : null,
+ stopTimerListenTopics : "",
+ startTimerListenTopics : "",
//callbacks
beforeLoading : "",
@@ -38,11 +40,21 @@
formId : "",
formFilter : "",
+ firstTime : true,
+
+ showError : true,
+ indicator: "",
+
+ //make dojo process the content
+ parseContent : true,
onDownloadStart : function(event) {
if(!dojo.string.isBlank(this.beforeLoading)) {
this.log("Executing " + this.beforeLoading);
- eval(this.beforeLoading);
+ var result = eval(this.beforeLoading);
+ if(result !== null && !result) {
+ return;
+ }
}
if(!dojo.string.isBlank(this.loadingText)) {
event.text = this.loadingText;
@@ -62,8 +74,22 @@
},
onError : function(event) {
- if(!dojo.string.isBlank(this.errorText)) {
- event.text = this.errorText;
+ if(this.showError) {
+ if(!dojo.string.isBlank(this.errorText)) {
+ event.text = this.errorText;
+ }
+ } else {
+ event.text = "";
+ }
+ },
+
+ notify : function(data, type, e) {
+ if(this.notifyTopicsArray) {
+ dojo.lang.forEach(this.notifyTopicsArray, function(topic) {
+ try {
+ dojo.event.topic.publish(topic, data, type, null);
+ } catch(e){}
+ });
}
},
@@ -78,45 +104,91 @@
dojo.lang.hitch(self, "startTimer")();
};
- if(this.updateInterval > 0) {
- this.timer = new dojo.lang.timing.Timer(this.updateInterval);
+ if(this.updateFreq > 0) {
+ this.timer = new dojo.lang.timing.Timer(this.updateFreq);
this.timer.onTick = hitchedRefresh;
+
+ //start the timer
+ if(this.autoStart) {
+ //start after delay
+ if(this.delay > 0) {
+ //start time after delay
+ dojo.lang.setTimeout(this.delay, hitchedStartTimer);
+ } else {
+ //start timer now
+ this.startTimer();
+ }
+ }
+ } else {
+ //no timer
+ if(this.delay > 0) {
+ //load after delay
+ dojo.lang.setTimeout(this.delay, hitchedRefresh);
+ }
}
- var delay = this.delay >= 0 ? this.delay : 0;
//start the timer
if(this.autoStart) {
+ this.log("autostarting");
//start after delay
- dojo.lang.setTimeout(delay, hitchedStartTimer);
- if(delay === 0) {
- //load content now
- this.refresh();
+ if(this.delay > 0) {
+ if(this.updateFreq > 0) {
+ //start time after delay
+ dojo.lang.setTimeout(this.delay, hitchedStartTimer);
+ } else {
+ //load 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);
- });
+ if(!dojo.string.isBlank(this.listenTopics)) {
+ this.log("Listening to " + this.listenTopics + " to refresh");
+ var topics = this.listenTopics.split(",");
+ if(topics) {
+ dojo.lang.forEach(topics, function(topic){
+ dojo.event.topic.subscribe(topic, self, "refresh");
+ });
+ }
+ }
+
+ if(!dojo.string.isBlank(this.notifyTopics)) {
+ this.notifyTopicsArray = this.notifyTopics.split(",");
+ }
+
+ if(!dojo.string.isBlank(this.stopTimerListenTopics)) {
+ this.log("Listening to " + this.stopTimerListenTopics + " to stop timer");
+ var stopTopics = this.stopTimerListenTopics.split(",");
+ if(stopTopics) {
+ dojo.lang.forEach(stopTopics, function(topic){
+ dojo.event.topic.subscribe(topic, self, "stopTimer");
+ });
+ }
+ }
+
+ if(!dojo.string.isBlank(this.startTimerListenTopics)) {
+ this.log("Listening to " + this.stopTimerListenTopics + " to start timer");
+ var startTopics = this.startTimerListenTopics.split(",");
+ if(startTopics) {
+ dojo.lang.forEach(startTopics, function(topic){
+ dojo.event.topic.subscribe(topic, self, "startTimer");
+ });
+ }
}
},
_downloadExternalContent: function(url, useCache) {
+ if(this.firstTime) {
+ this.firstTime = false;
+ if(this.delay > 0) {
+ return;
+ }
+ }
+ //show indicator
+ dojo.html.show(this.indicator);
+
+ this.notify(this.widgetId, "before", {});
this._handleDefaults("Loading...", "onDownloadStart");
var self = this;
dojo.io.bind({
@@ -127,6 +199,16 @@
formNode: dojo.byId(self.formId),
formFilter: window[self.formFilter],
handler: function(type, data, e) {
+ //hide indicator
+ dojo.html.hide(self.indicator);
+
+ if(!dojo.string.isBlank(self.afterLoading)) {
+ self.log("Executing " + self.afterLoading);
+ eval(self.afterLoading);
+ }
+
+ self.notify(data, type, null);
+
if(type == "load") {
self.onDownloadEnd.call(self, url, data);
} else {
@@ -151,7 +233,7 @@
startTimer : function() {
if(this.timer && !this.timer.isRunning) {
- this.log("starting timer with update interval " + this.updateInterval);
+ this.log("starting timer with update interval " + this.updateFreq);
this.timer.start();
}
}
Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js?view=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ComboBox.js Sun Dec 24 14:46:07 2006
@@ -19,16 +19,12 @@
this._lastSearch = "";
this._lastSearchResults = null;
- this.beforeLoading = "";
- this.afterLoading = "";
-
this.formId = "";
this.formFilter = "";
+ this.cbox = null;
this.init = function(/*Widget*/ cbox, /*DomNode*/ node){
- this.beforeLoading = cbox.beforeLoading;
- this.afterLoading = cbox.afterLoading;
-
+ this.cbox = cbox;
this.formId = cbox.formId;
this.formFilter = cbox.formFilter;
@@ -55,18 +51,18 @@
};
this.getData = function(/*String*/ url){
- if(!dojo.string.isBlank(this.beforeLoading)) {
- eval(this.beforeLoading);
- }
+ //show indicator
+ dojo.html.show(this.cbox.indicator);
dojo.io.bind({
url: url,
formNode: dojo.byId(this.formId),
formFilter: window[this.formFilter],
- load: dojo.lang.hitch(this, function(type, data, evt){
- if(!dojo.string.isBlank(this.afterLoading)) {
- eval(this.afterLoading);
- }
+ load: dojo.lang.hitch(this, function(type, data, evt) {
+ //show indicator
+ dojo.html.hide(this.cbox.indicator);
+
+ this.cbox.notify.apply(this.cbox, [data, type, evt]);
if(!dojo.lang.isArray(data)){
var arrData = [];
for(var key in data){
@@ -183,16 +179,26 @@
dropdownWidth: 0,
itemHeight: 0,
- refreshListenTopic : "",
- onValueChangedPublishTopic : "",
+ listenTopics : "",
+ notifyTopics : "",
+ notifyTopicsArray : null,
- //callbacks
- beforeLoading : "",
- afterLoading : "",
+ indicator : "",
formId : "",
formFilter : "",
dataProviderClass: "struts.widget.ComboBoxDataProvider",
+
+ loadOnType : false,
+ loadMinimum : 3,
+
+ initialValue : "",
+ initialKey : "",
+
+ visibleDownArrow : true,
+ fadeTime : 100,
+
+ templateCssPath: dojo.uri.dojoUri("struts/ComboBox.css"),
//from Dojo's ComboBox
showResultList: function() {
// Our dear friend IE doesnt take max-height so we need to calculate that on our own every time
@@ -278,16 +284,68 @@
postCreate : function() {
struts.widget.ComboBox.superclass.postCreate.apply(this);
-
+ var self = this;
//events
- if(!dojo.string.isBlank(this.refreshListenTopic)) {
- var self = this;
- dojo.event.topic.subscribe(this.refreshListenTopic, function() {
- self.dataProvider.getData(self.dataUrl);
- });
+ if(!dojo.string.isBlank(this.listenTopics)) {
+ var topics = this.listenTopics.split(",");
+ for(var i = 0; i < topics.length; i++) {
+ dojo.event.topic.subscribe(topics[i], function() {
+ self.notify(this.widgetId, "before", {});
+ self.dataProvider.getData(self.dataUrl);
+ });
+ }
}
- if(!dojo.string.isBlank(this.onValueChangedPublishTopic)) {
- dojo.event.topic.registerPublisher(this.onValueChangedPublishTopic, this, "onValueChanged");
+
+ if(!dojo.string.isBlank(this.notifyTopics)) {
+ this.notifyTopicsArray = this.notifyTopics.split(",");
}
+
+ //better name
+ this.comboBoxSelectionValue.name = this.name + "Key";
+
+ //init values
+ this.comboBoxValue.value = this.initialValue;
+ this.comboBoxSelectionValue.value = this.initialKey;
+ this.textInputNode.value = this.initialValue;
+
+ //hide arrow?
+ if(!this.visibleDownArrow) {
+ dojo.html.hide(this.downArrowNode);
+ }
+ },
+
+ clearValues : function() {
+ this.comboBoxValue.value = "";
+ this.comboBoxSelectionValue.value = "";
+ this.textInputNode.value = "";
+ },
+
+ onValueChanged : function(data) {
+ this.notify(data, "valuechanged", null);
+ },
+
+ notify : function(data, type, e) {
+ if(this.notifyTopicsArray) {
+ dojo.lang.forEach(this.notifyTopicsArray, function(topic) {
+ try {
+ dojo.event.topic.publish(topic, data, type, null);
+ } catch(e){}
+ });
+ }
+ },
+
+ startSearchFromInput: function() {
+ var searchStr = this.textInputNode.value;
+ if(this.loadOnType) {
+ if(searchStr.length >= this.loadMinimum) {
+ var nuHref = this.dataUrl + (this.dataUrl.indexOf("?") > -1 ? "&" : "?");
+ nuHref += this.name + '=' + searchStr;
+ this.dataProvider.getData(nuHref);
+ this.startSearch(searchStr);
+ }
+ }
+ else {
+ this.startSearch(searchStr);
+ }
}
});
Modified: 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=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/ajax-common.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/ajax-common.ftl Sun Dec 24 14:46:07 2006
@@ -37,8 +37,11 @@
<#if parameters.executeScripts?exists>
executeScripts="${parameters.executeScripts?string?html}"<#rt/>
</#if>
- <#if parameters.refreshListenTopic?if_exists != "">
- refreshListenTopic="${parameters.refreshListenTopic?html}"<#rt/>
+ <#if parameters.listenTopics?if_exists != "">
+ listenTopics="${parameters.listenTopics?html}"<#rt/>
+ </#if>
+ <#if parameters.notifyTopics?if_exists != "">
+ notifyTopics="${parameters.notifyTopics?html}"<#rt/>
</#if>
<#if parameters.beforeLoading?if_exists != "">
beforeLoading="${parameters.beforeLoading?html}"<#rt/>
@@ -51,4 +54,10 @@
</#if>
<#if parameters.handler?if_exists != "">
handler="${parameters.handler?html}"<#rt/>
- </#if>
\ No newline at end of file
+ </#if>
+ <#if parameters.indicator?if_exists != "">
+ indicator="${parameters.indicator?html}"<#rt/>
+ </#if>
+ <#if parameters.showErrorTransportText?exists>
+ showError="${parameters.showErrorTransportText?string?html}"<#rt/>
+ </#if>
Modified: struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl?view=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/autocompleter.ftl Sun Dec 24 14:46:07 2006
@@ -20,8 +20,8 @@
<#if parameters.autoComplete?exists>
autoComplete="${parameters.autoComplete?string?html}"<#rt/>
</#if>
-<#if parameters.searchDelay?exists>
- searchDelay="${parameters.searchDelay?c}"<#rt/>
+<#if parameters.delay?exists>
+ searchDelay="${parameters.delay?c}"<#rt/>
</#if>
<#if parameters.disabled?exists>
disabled="${parameters.disabled?string?html}"<#rt/>
@@ -41,8 +41,11 @@
<#if parameters.maxlength?exists>
maxlength="${parameters.maxlength?string?html}"<#rt/>
</#if>
-<#if parameters.nameValue?exists>
- value="<@s.property value="parameters.nameValue"/>"<#rt/>
+<#if parameters.nameValue?if_exists != "">
+ initialValue="${parameters.nameValue}"<#rt/>
+</#if>
+<#if parameters.key?if_exists != "">
+ initialKey="${parameters.key}"<#rt/>
</#if>
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
@@ -56,19 +59,17 @@
<#if parameters.formFilter?if_exists != "">
formFilter="${parameters.formFilter?html}"<#rt/>
</#if>
-<#if parameters.refreshListenTopic?if_exists != "">
- refreshListenTopic="${parameters.refreshListenTopic?html}"<#rt/>
-</#if>
-<#if parameters.onValueChangedPublishTopic?if_exists != "">
- onValueChangedPublishTopic="${parameters.onValueChangedPublishTopic?html}"<#rt/>
+<#if parameters.listenTopics?if_exists != "">
+ listenTopics="${parameters.listenTopics?html}"<#rt/>
</#if>
-<#if parameters.beforeLoading?if_exists != "">
- beforeLoading="${parameters.beforeLoading?html}"<#rt/>
+<#if parameters.notifyTopics?if_exists != "">
+ notifyTopics="${parameters.notifyTopics?html}"<#rt/>
</#if>
-<#if parameters.afterLoading?if_exists != "">
- afterLoading="${parameters.afterLoading?html}"<#rt/>
+<#if parameters.indicator?if_exists != "">
+ indicator="${parameters.indicator?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
>
+
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=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/div.ftl Sun Dec 24 14:46:07 2006
@@ -2,17 +2,17 @@
<#if parameters.delay?exists>
delay="${parameters.delay?c}"<#rt/>
</#if>
- <#if parameters.updateInterval?exists>
- updateInterval="${parameters.updateInterval?c}"<#rt/>
+ <#if parameters.updateFreq?exists>
+ updateFreq="${parameters.updateFreq?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 parameters.startTimerListenTopics?if_exists != "">
+ startTimerListenTopics="${parameters.startTimerListenTopics?html}"<#rt/>
</#if>
- <#if parameters.stopTimerListenTopic?if_exists != "">
- stopTimerListenTopic="${parameters.stopTimerListenTopic?html}"<#rt/>
+ <#if parameters.stopTimerListenTopics?if_exists != "">
+ stopTimerListenTopics="${parameters.stopTimerListenTopics?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/tab-close.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/tab-close.ftl?view=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- 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 Sun Dec 24 14:46:07 2006
@@ -1,13 +1 @@
</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/simple/autocompleter.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl?view=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/autocompleter.ftl Sun Dec 24 14:46:07 2006
@@ -1,4 +1,4 @@
-<select dojoType="struts:ComboBox" mode="local"<#rt/>
+<select dojoType="struts:ComboBox"<#rt/>
<#if parameters.id?if_exists != "">
id="${parameters.id?html}"<#rt/>
</#if>
@@ -8,6 +8,9 @@
<#if parameters.cssStyle?if_exists != "">
style="${parameters.cssStyle?html}"<#rt/>
</#if>
+<#if parameters.href?if_exists != "">
+ dataUrl="${parameters.href}"<#rt/>
+</#if>
<#if parameters.forceValidOption?exists>
forceValidOption="${parameters.forceValidOption?string?html}"<#rt/>
</#if>
@@ -17,8 +20,8 @@
<#if parameters.autoComplete?exists>
autoComplete="${parameters.autoComplete?string?html}"<#rt/>
</#if>
-<#if parameters.searchDelay?exists>
- searchDelay="${parameters.searchDelay?c}"<#rt/>
+<#if parameters.delay?exists>
+ searchDelay="${parameters.delay?c}"<#rt/>
</#if>
<#if parameters.disabled?exists>
disabled="${parameters.disabled?string?html}"<#rt/>
@@ -38,20 +41,29 @@
<#if parameters.maxlength?exists>
maxlength="${parameters.maxlength?string?html}"<#rt/>
</#if>
+<#if parameters.nameValue?if_exists != "">
+ initialValue="${parameters.nameValue}"<#rt/>
+</#if>
+<#if parameters.key?if_exists != "">
+ initialKey="${parameters.key}"<#rt/>
+</#if>
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
</#if>
<#if parameters.tabindex?exists>
tabindex="${parameters.tabindex?html}"<#rt/>
</#if>
-<#if parameters.onValueChangedPublishTopic?if_exists != "">
- onValueChangedPublishTopic="${parameters.onValueChangedPublishTopic?html}"<#rt/>
+<#if parameters.formId?if_exists != "">
+ formId="${parameters.formId?html}"<#rt/>
+</#if>
+<#if parameters.formFilter?if_exists != "">
+ formFilter="${parameters.formFilter?html}"<#rt/>
</#if>
-<#if parameters.beforeLoading?if_exists != "">
- beforeLoading="${parameters.beforeLoading?html}"<#rt/>
+<#if parameters.listenTopics?if_exists != "">
+ listenTopics="${parameters.listenTopics?html}"<#rt/>
</#if>
-<#if parameters.afterLoading?if_exists != "">
- afterLoading="${parameters.afterLoading?html}"<#rt/>
+<#if parameters.notifyTopics?if_exists != "">
+ notifyTopics="${parameters.notifyTopics?html}"<#rt/>
</#if>
<#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
>
@@ -83,4 +95,5 @@
</...@s.iterator>
</#if>
</select>
+
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=490079&r1=490078&r2=490079
==============================================================================
--- 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 Sun Dec 24 14:46:07 2006
@@ -43,10 +43,12 @@
tag.setLoadingText("d");
tag.setAfterLoading("e");
tag.setBeforeLoading("f");
- tag.setRefreshListenTopic("g");
+ tag.setListenTopics("g");
tag.setTargets("h");
tag.setHandler("i");
-
+ tag.setNotifyTopics("j");
+ tag.setIndicator("k");
+ tag.setShowErrorTransportText("true");
tag.doStartTag();
tag.doEndTag();
Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java?view=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java (original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java Sun Dec 24 14:46:07 2006
@@ -17,15 +17,12 @@
tag.setHref("a");
tag.setDropdownWidth("10");
tag.setDropdownHeight("10");
- tag.setSearchDelay("100");
+ tag.setDelay("100");
tag.setSearchType("b");
tag.setDisabled("c");
tag.setName("f");
tag.setValue("g");
- tag.setBeforeLoading("h");
- tag.setAfterLoading("i");
- tag.setRefreshListenTopic("j");
- tag.setOnValueChangedPublishTopic("k");
+ tag.setIndicator("h");
tag.doStartTag();
tag.doEndTag();
@@ -43,7 +40,7 @@
tag.setHref("a");
tag.setDropdownWidth("10");
tag.setDropdownHeight("10");
- tag.setSearchDelay("100");
+ tag.setDelay("100");
tag.setSearchType("b");
tag.setDisabled("c");
tag.setName("f");
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=490079&r1=490078&r2=490079
==============================================================================
--- 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 Sun Dec 24 14:46:07 2006
@@ -58,14 +58,15 @@
tag.setErrorText("c");
tag.setAutoStart("true");
tag.setDelay("4000");
- tag.setUpdateInterval("1000");
- tag.setRefreshListenTopic("g");
- tag.setStartTimerListenTopic("h");
- tag.setStopTimerListenTopic("i");
+ tag.setUpdateFreq("1000");
+ tag.setListenTopics("g");
+ tag.setStartTimerListenTopics("h");
+ tag.setStopTimerListenTopics("i");
tag.setBeforeLoading("j");
tag.setAfterLoading("k");
tag.setRefreshOnShow("true");
tag.setHandler("l");
+ tag.setIndicator("m");
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=490079&r1=490078&r2=490079
==============================================================================
--- 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 Sun Dec 24 14:46:07 2006
@@ -52,12 +52,14 @@
tag.setHref("b");
tag.setLoadingText("c");
tag.setErrorText("d");
- tag.setRefreshListenTopic("e");
- tag.setBeforeLoading("f");
- tag.setAfterLoading("g");
+ tag.setListenTopics("e");
+ tag.setPreInvokeJS("f");
+ tag.setOnLoadJS("g");
tag.setHandler("h");
tag.setType("submit");
tag.setLabel("i");
+ tag.setNotifyTopics("k");
+ tag.setIndicator("l");
tag.doStartTag();
tag.doEndTag();
@@ -76,12 +78,14 @@
tag.setHref("b");
tag.setLoadingText("c");
tag.setErrorText("d");
- tag.setRefreshListenTopic("e");
- tag.setBeforeLoading("f");
- tag.setAfterLoading("g");
+ tag.setListenTopics("e");
+ tag.setPreInvokeJS("f");
+ tag.setOnLoadJS("g");
tag.setHandler("h");
tag.setType("button");
tag.setLabel("i");
+ tag.setNotifyTopics("k");
+ tag.setIndicator("l");
tag.doStartTag();
tag.doEndTag();
@@ -100,13 +104,15 @@
tag.setHref("b");
tag.setLoadingText("c");
tag.setErrorText("d");
- tag.setRefreshListenTopic("e");
- tag.setBeforeLoading("f");
- tag.setAfterLoading("g");
+ tag.setListenTopics("e");
+ tag.setPreInvokeJS("f");
+ tag.setOnLoadJS("g");
tag.setHandler("h");
tag.setType("image");
tag.setLabel("i");
tag.setSrc("j");
+ tag.setNotifyTopics("k");
+ tag.setIndicator("l");
tag.doStartTag();
tag.doEndTag();
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt?view=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-1.txt Sun Dec 24 14:46:07 2006
@@ -1,16 +1,13 @@
<input
- dojoType="struts:ComboBox"
- id="f"
- dataUrl="a"
- forceValidOption="false"
- searchType="b"
- autoComplete="true"
- dropdownWidth="10"
- dropdownHeight="10"
- name="f"
- value="g"
- refreshListenTopic="j"
- onValueChangedPublishTopic="k"
- beforeLoading="h"
- afterLoading="i"
->
\ No newline at end of file
+ dojoType="struts:ComboBox"
+ id="f"
+ dataUrl="a"
+ forceValidOption="false"
+ searchType="b"
+ autoComplete="true"
+ searchDelay="100"
+ dropdownWidth="10"
+ dropdownHeight="10"
+ name="f"
+ initialValue="g"
+indicator="h">
Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt?view=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Autocompleter-2.txt Sun Dec 24 14:46:07 2006
@@ -1,13 +1,15 @@
<select
- dojoType="struts:ComboBox"
- mode="local"
- id="f"
- forceValidOption="false"
- searchType="b"
- autoComplete="true"
- dropdownWidth="10"
- dropdownHeight="10"
- name="f">
- <option value="d">d</option>
- <option value="e">e</option>
+ dojoType="struts:ComboBox"
+ id="f"
+ dataUrl="a"
+ forceValidOption="false"
+ searchType="b"
+ autoComplete="true"
+ searchDelay="100"
+ dropdownWidth="10"
+ dropdownHeight="10"
+ name="f"
+ >
+ <option value="d">d</option>
+ <option value="e">e</option>
</select>
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=490079&r1=490078&r2=490079
==============================================================================
--- 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 Sun Dec 24 14:46:07 2006
@@ -1,16 +1,18 @@
<div
dojoType="struts:BindDiv"
delay="4000"
- updateInterval="1000"
+ updateFreq="1000"
autoStart="true"
- startTimerListenTopic="h"
- stopTimerListenTopic="i"
+ startTimerListenTopics="h"
+ stopTimerListenTopics="i"
id="mylabel"
href="a"
loadingText="b"
errorText="c"
- refreshListenTopic="g"
+ listenTopics="g"
beforeLoading="j"
afterLoading="k"
- handler="l">
+ handler="l"
+ indicator="m"
+ showError="true">
</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=490079&r1=490078&r2=490079
==============================================================================
--- 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 Sun Dec 24 14:46:07 2006
@@ -4,9 +4,12 @@
href="a"
loadingText="d"
errorText="c"
- refreshListenTopic="g"
+ listenTopics="g"
+ notifyTopics="j"
beforeLoading="f"
afterLoading="e"
targets="h"
- handler="i">
-</a>
\ No newline at end of file
+ handler="i"
+ indicator="k"
+ showError="true">
+</a>
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=490079&r1=490078&r2=490079
==============================================================================
--- 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 Sun Dec 24 14:46:07 2006
@@ -10,10 +10,13 @@
href="b"
loadingText="c"
errorText="d"
- refreshListenTopic="e"
+ listenTopics="e"
+ notifyTopics="k"
beforeLoading="f"
afterLoading="g"
- handler="h"/>
+ handler="h"
+ indicator="l"
+ />
</div>
</td>
- </tr>
\ No newline at end of file
+ </tr>
Modified: 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=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-2.txt Sun Dec 24 14:46:07 2006
@@ -9,11 +9,14 @@
href="b"
loadingText="c"
errorText="d"
- refreshListenTopic="e"
+ listenTopics="e"
+ notifyTopics="k"
beforeLoading="f"
afterLoading="g"
handler="h"
- value="i"/>
+ indicator="l"
+ value="i"
+ />
</div>
</td>
- </tr>
\ No newline at end of file
+ </tr>
Modified: 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=diff&rev=490079&r1=490078&r2=490079
==============================================================================
--- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt (original)
+++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/submit-ajax-3.txt Sun Dec 24 14:46:07 2006
@@ -12,10 +12,13 @@
href="b"
loadingText="c"
errorText="d"
- refreshListenTopic="e"
+ listenTopics="e"
+ notifyTopics="k"
beforeLoading="f"
afterLoading="g"
- handler="h"/>
+ handler="h"
+ indicator="l"
+ />
</div>
</td>
- </tr>
\ No newline at end of file
+ </tr>