Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js Sat Apr 21 08:07:08 2007 @@ -22055,6 +22055,7 @@ + dojo.widget.defineWidget( "struts.widget.Bind", dojo.widget.HtmlWidget, { @@ -22090,6 +22091,10 @@ indicator : "", parseContent : true, + + highlightColor : "", + highlightDuration : 2000, + postCreate : function() { var self = this; @@ -22142,7 +22147,6 @@ } } - if(dojo.string.isBlank(this.href) && dojo.string.isBlank(this.formId)) { //no href and no formId, we must be inside a form this.formNode = dojo.dom.getFirstAncestorByTag(this.domNode, "form"); @@ -22159,6 +22163,21 @@ } }, + highlight : function() { + if(!dojo.string.isBlank(this.highlightColor)) { + var nodes = []; + //add nodes to array + dojo.lang.forEach(this.targetsArray, function(target) { + var node = dojo.byId(target); + if(node) { + nodes.push(node); + } + }); + var effect = dojo.lfx.html.highlight(nodes, this.highlightColor, this.highlightDuration); + effect.play(); + } + }, + log : function(text) { dojo.debug("[" + (this.widgetId ? this.widgetId : "unknown") + "] " + text); }, @@ -22207,6 +22226,7 @@ else { this.setContent(data); } + this.highlight(); } else { if(this.showError) { var message = dojo.string.isBlank(this.errorText) ? e.message : this.errorText; @@ -22486,6 +22506,9 @@ //make dojo process the content parseContent : true, + highlightColor : "", + highlightDuration : 2000, + onDownloadStart : function(event) { if(!this.showLoading) { event.returnValue = false; @@ -22495,6 +22518,13 @@ event.text = this.loadingText; } }, + + highlight : function() { + if(!dojo.string.isBlank(this.highlightColor)) { + var effect = dojo.lfx.html.highlight([this.domNode], this.highlightColor, this.highlightDuration); + effect.play(); + } + }, onDownloadError : function(event) { this.onError(event); @@ -22680,6 +22710,7 @@ if(type == "load") { self.onDownloadEnd.call(self, url, data); + self.highlight(); } 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"); @@ -23999,7 +24030,7 @@ struts.widget.ComboBoxDataProvider = function(combobox, node){ this.data = []; - this.searchLimit = 30; + this.searchLimit = combobox.searchLimit; this.searchType = "STARTSTRING"; // may also be "STARTWORD" or "SUBSTRING" this.caseSensitive = false; // for caching optimizations @@ -24230,6 +24261,10 @@ dataFieldName : "", keyName: "", templateCssPath: dojo.uri.dojoUri("struts/ComboBox.css"), + + //how many results are shown + searchLimit : 30, + //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
Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl Sat Apr 21 08:07:08 2007 @@ -67,3 +67,9 @@ <#if parameters.showLoadingText?exists> showLoading="${parameters.showLoadingText?string?html}"<#rt/> </#if> + <#if parameters.highlightColor?if_exists != ""> + highlightColor="${parameters.highlightColor?html}"<#rt/> + </#if> + <#if parameters.highlightDuration?if_exists != ""> + highlightDuration="${parameters.highlightDuration?html}"<#rt/> + </#if> Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl Sat Apr 21 08:07:08 2007 @@ -42,6 +42,12 @@ <#if parameters.handler?if_exists != ""> "handler": "${parameters.handler?html}" </#if> + <#if parameters.highlightColor?if_exists != ""> + "highlightColor" : "${parameters.highlightColor?html}"<#rt/> + </#if> + <#if parameters.highlightDuration?if_exists != ""> + "highlightDuration" : "${parameters.highlightDuration?html}"<#rt/> + </#if> }); }); </script> Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java (original) +++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java Sat Apr 21 08:07:08 2007 @@ -48,6 +48,8 @@ tag.setShowErrorTransportText("true"); tag.setShowLoadingText("true"); tag.setErrorNotifyTopics("l"); + tag.setHighlightColor("m"); + tag.setHighlightDuration("n"); tag.doStartTag(); tag.doEndTag(); Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java (original) +++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java Sat Apr 21 08:07:08 2007 @@ -3,7 +3,7 @@ import org.apache.struts2.dojo.TestAction; public class BindTest extends AbstractUITagTest { - public void testSubmit() throws Exception { + public void testAll() throws Exception { TestAction testAction = (TestAction) action; testAction.setFoo("bar"); @@ -18,13 +18,14 @@ tag.setBeforeNotifyTopics("f"); tag.setAfterNotifyTopics("g"); tag.setHandler("h"); - tag.setLabel("i"); tag.setNotifyTopics("k"); tag.setIndicator("l"); tag.setShowLoadingText("true"); tag.setErrorNotifyTopics("m"); tag.setSources("n"); tag.setEvents("o"); + tag.setHighlightColor("p"); + tag.setHighlightDuration("q"); tag.doStartTag(); tag.doEndTag(); Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java (original) +++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java Sat Apr 21 08:07:08 2007 @@ -53,6 +53,8 @@ tag.setSeparateScripts("false"); tag.setErrorNotifyTopics("n"); tag.setClosable("true"); + tag.setHighlightColor("o"); + tag.setHighlightDuration("p"); tag.doStartTag(); tag.doEndTag(); Modified: struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java (original) +++ struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java Sat Apr 21 08:07:08 2007 @@ -44,6 +44,8 @@ tag.setIndicator("l"); tag.setShowLoadingText("true"); tag.setErrorNotifyTopics("m"); + tag.setHighlightColor("n"); + tag.setHighlightDuration("o"); tag.doStartTag(); tag.doEndTag(); Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt (original) +++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt Sat Apr 21 08:07:08 2007 @@ -12,6 +12,8 @@ "indicator":"l", "showError":"true", "handler":"h" + "highlightColor":"p" + "highlightDuration":"q" }); }); </script> Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt (original) +++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt Sat Apr 21 08:07:08 2007 @@ -19,5 +19,7 @@ handler="l" indicator="m" showError="true" - showLoading="true"> + showLoading="true" + highlightColor="o" + highlightDuration="p"> </div> Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt (original) +++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt Sat Apr 21 08:07:08 2007 @@ -13,5 +13,7 @@ handler="i" indicator="k" showError="true" - showLoading="true"> + showLoading="true" + highlightColor="m" + highlightDuration="n"> </a> Modified: struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt?view=diff&rev=531046&r1=531045&r2=531046 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt (original) +++ struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt Sat Apr 21 08:07:08 2007 @@ -16,4 +16,6 @@ handler="h" indicator="l" showLoading="true" + highlightColor="n" + highlightDuration="o" />
