Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 61108 invoked from network); 24 Mar 2007 15:38:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Mar 2007 15:38:23 -0000 Received: (qmail 69004 invoked by uid 500); 24 Mar 2007 15:38:29 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 68957 invoked by uid 500); 24 Mar 2007 15:38:28 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 68946 invoked by uid 99); 24 Mar 2007 15:38:28 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Mar 2007 08:38:28 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Mar 2007 08:38:20 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C30AA1A9838; Sat, 24 Mar 2007 08:37:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r522039 - in /struts/struts2/trunk: apps/showcase/src/main/webapp/ajax/tabbedpanel/ core/src/site/resources/tags/ core/src/site/resources/tags/ajax/ plugins/dojo/src/main/java/org/apache/struts2/dojo/components/ plugins/dojo/src/main/java/o... Date: Sat, 24 Mar 2007 15:37:59 -0000 To: commits@struts.apache.org From: musachy@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070324153759.C30AA1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: musachy Date: Sat Mar 24 08:37:58 2007 New Revision: 522039 URL: http://svn.apache.org/viewvc?view=rev&rev=522039 Log: WW-1812 * Flag "closeButton" attribute as deprecated on tabbedpanel tag, and add "closable" on div tag * Update showcase tabbedpanel example * Remove ajax html doc from old location on core Removed: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example4.jsp struts/struts2/trunk/core/src/site/resources/tags/autocompleter.html struts/struts2/trunk/core/src/site/resources/tags/datepicker.html struts/struts2/trunk/core/src/site/resources/tags/datetimepicker.html struts/struts2/trunk/core/src/site/resources/tags/tabbedPanel.html struts/struts2/trunk/core/src/site/resources/tags/timepicker.html struts/struts2/trunk/core/src/site/resources/tags/tree.html struts/struts2/trunk/core/src/site/resources/tags/treenode.html Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/div.ftl struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DivTest.java struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/example5.jsp Sat Mar 24 08:37:58 2007 @@ -11,11 +11,11 @@ - - + + I'm a Tab!!! - + I'm the other Tab!!! Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/tabbedpanel/index.jsp Sat Mar 24 08:37:58 2007 @@ -14,8 +14,7 @@
  • A local tabbed panel width fixed size (doLayout="true")
  • A remote (href != "") and local tabbed panel
  • Various remote and local tabbed panels (with enclosed tabbed pannels) with layout (doLayout="false")
    • -
  • A local tabbed panel width fixed size (doLayout="true") with close button on tabs(closeButton="tab"), and tabs on the right (labelposition="right")
    • -
  • A local tabbed panel width fixed size (doLayout="true") with close button on the tab pane (closeButton="pane"), and tabs on the bottom (labelposition="bottom")
    • +
  • A local tabbed panel width fixed size (doLayout="true") with close button on the tab pane (closable="true" on tabs), and tabs on the bottom (labelposition="bottom")
    • Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html Sat Mar 24 08:37:58 2007 @@ -12,7 +12,7 @@

    Description

    - Render a HTML href element that when clicked can optionally call a URL via remote XMLHttpRequest and updates its targets + Renders an HTML anchor element that when clicked calls a URL via remote XMLHttpRequest and updates its targets content

    Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/autocompleter.html Sat Mar 24 08:37:58 2007 @@ -36,6 +36,14 @@ Set the html accesskey attribute on rendered html element + afterNotifyTopics + false + + true + String + Comma delimmited list of topics that will published after the request(if the request succeeds) + + autoComplete false false @@ -44,6 +52,14 @@ Whether autocompleter should make suggestion on the textbox + beforeNotifyTopics + false + + true + String + Comma delimmited list of topics that will published before the request + + cssClass false @@ -108,6 +124,14 @@ Decide if an empty option is to be inserted. Default false. + errorNotifyTopics + false + + true + String + Comma delimmited list of topics that will published after the request(if the request fails) + + forceValidOption false false @@ -514,6 +538,14 @@ true String Preset the value of input element + + + valueNotifyTopics + false + + true + String + Comma delimmited list of topics that will published when a value is selected Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html Sat Mar 24 08:37:58 2007 @@ -60,6 +60,14 @@ Comma delimmited list of topics that will published before the request + closable + false + false + true + String + Show a close button when the div is inside a 'tabbedpanel' + + cssClass false Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html Sat Mar 24 08:37:58 2007 @@ -41,7 +41,7 @@ true String - Where the close button will be placed, possible values are 'tab' and 'pane' + Deprecated. Use 'closable' on each div(tab) cssClass Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java (original) +++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Div.java Sat Mar 24 08:37:58 2007 @@ -72,7 +72,8 @@ protected String stopTimerListenTopics; protected String refreshOnShow; protected String separateScripts; - + protected String closable; + public Div(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { super(stack, request, response); } @@ -102,6 +103,8 @@ addParameter("stopTimerListenTopics", findString(stopTimerListenTopics)); if (separateScripts != null) addParameter("separateScripts", findValue(separateScripts, Boolean.class)); + if (closable != null) + addParameter("closable", findValue(closable, Boolean.class)); } @StrutsTagAttribute(description="Start timer automatically", type="Boolean", defaultValue="true") @@ -137,5 +140,10 @@ @StrutsTagAttribute(description="Run scripts in a separate scope, unique for each Div", defaultValue="true") public void setSeparateScripts(String separateScripts) { this.separateScripts = separateScripts; + } + + @StrutsTagAttribute(description="Show a close button when the div is inside a 'tabbedpanel'", defaultValue="false") + public void setClosable(String closable) { + this.closable = closable; } } Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java (original) +++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/TabbedPanel.java Sat Mar 24 08:37:58 2007 @@ -131,7 +131,7 @@ this.selectedTab = selectedTab; } - @StrutsTagAttribute(description="Where the close button will be placed, possible values are 'tab' and 'pane'") + @StrutsTagAttribute(description="Deprecated. Use 'closable' on each div(tab)") public void setCloseButton(String closeButton) { this.closeButton = closeButton; } Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java (original) +++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DivTag.java Sat Mar 24 08:37:58 2007 @@ -39,6 +39,7 @@ protected String stopTimerListenTopics; protected String refreshOnShow; protected String separateScripts; + protected String closable; public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new Div(stack, req, res); @@ -55,6 +56,7 @@ div.setStopTimerListenTopics(stopTimerListenTopics); div.setRefreshOnShow(refreshOnShow); div.setSeparateScripts(separateScripts); + div.setClosable(closable); } public void setAutoStart(String autoStart) { @@ -83,5 +85,9 @@ public void setSeparateScripts(String separateScripts) { this.separateScripts = separateScripts; + } + + public void setClosable(String closable) { + this.closable = closable; } } Modified: struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/div.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/div.ftl?view=diff&rev=522039&r1=522038&r2=522039 ============================================================================== --- struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/div.ftl (original) +++ struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/div.ftl Sat Mar 24 08:37:58 2007 @@ -8,6 +8,9 @@ <#if parameters.autoStart?exists> autoStart="${parameters.autoStart?string?html}"<#rt/> + <#if parameters.closable?exists> + closable="${parameters.closable?string?html}"<#rt/> + <#if parameters.startTimerListenTopics?if_exists != ""> startTimerListenTopics="${parameters.startTimerListenTopics?html}"<#rt/> 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=522039&r1=522038&r2=522039 ============================================================================== --- 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 Mar 24 08:37:58 2007 @@ -52,6 +52,7 @@ tag.setShowLoadingText("true"); tag.setSeparateScripts("false"); tag.setErrorNotifyTopics("n"); + tag.setClosable("true"); tag.doStartTag(); tag.doEndTag(); 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=522039&r1=522038&r2=522039 ============================================================================== --- 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 Mar 24 08:37:58 2007 @@ -3,6 +3,7 @@ delay="4000" updateFreq="1000" autoStart="true" + closable="true" startTimerListenTopics="h" stopTimerListenTopics="i" refreshOnShow="true"