Author: husted Date: Mon Mar 19 20:19:36 2007 New Revision: 520251 URL: http://svn.apache.org/viewvc?view=rev&rev=520251 Log: WW-1825 "Anchor tag inserts newline at end of tag" apply patch submitted by Claus Ibsen
Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html 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=520251&r1=520250&r2=520251 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html Mon Mar 19 20:19:36 2007 @@ -36,6 +36,22 @@ <td align="left" valign="top">Set the html accesskey attribute on rendered html element</td> </tr> <tr> + <td align="left" valign="top">afterNotifyTopics</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Comma delimmited list of topics that will published after the request(if the request succeeds)</td> + </tr> + <tr> + <td align="left" valign="top">beforeNotifyTopics</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Comma delimmited list of topics that will published before the request</td> + </tr> + <tr> <td align="left" valign="top">cssClass</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -60,6 +76,14 @@ <td align="left" valign="top">Set the html disabled attribute on rendered html element</td> </tr> <tr> + <td align="left" valign="top">errorNotifyTopics</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Comma delimmited list of topics that will published after the request(if the request fails)</td> + </tr> + <tr> <td align="left" valign="top">errorText</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -177,15 +201,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Topics that will published when the remote call completes</td> - </tr> - <tr> - <td align="left" valign="top">onLoadJS</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">true</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'notifyTopics'. Javascript code execute after reload</td> + <td align="left" valign="top">Comma delimmited list of topics that will published before and after the request, and on errors</td> </tr> <tr> <td align="left" valign="top">onblur</td> @@ -306,14 +322,6 @@ <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> <td align="left" valign="top">Set template to use for opening the rendered html.</td> - </tr> - <tr> - <td align="left" valign="top">preInvokeJS</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">true</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'notifyTopics'. Javascript code execute before reload</td> </tr> <tr> <td align="left" valign="top">required</td> 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=520251&r1=520250&r2=520251 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html Mon Mar 19 20:19:36 2007 @@ -36,12 +36,12 @@ <td align="left" valign="top">Set the html accesskey attribute on rendered html element</td> </tr> <tr> - <td align="left" valign="top">afterLoading</td> + <td align="left" valign="top">afterNotifyTopics</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'notifyTopics'. Javascript code execute after reload</td> + <td align="left" valign="top">Comma delimmited list of topics that will published after the request(if the request succeeds)</td> </tr> <tr> <td align="left" valign="top">autoStart</td> @@ -52,6 +52,14 @@ <td align="left" valign="top">Start timer automatically</td> </tr> <tr> + <td align="left" valign="top">beforeNotifyTopics</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Comma delimmited list of topics that will published before the request</td> + </tr> + <tr> <td align="left" valign="top">cssClass</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -84,6 +92,14 @@ <td align="left" valign="top">Set the html disabled attribute on rendered html element</td> </tr> <tr> + <td align="left" valign="top">errorNotifyTopics</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Comma delimmited list of topics that will published after the request(if the request fails)</td> + </tr> + <tr> <td align="left" valign="top">errorText</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -201,7 +217,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Topics that will published when the remote call completes</td> + <td align="left" valign="top">Comma delimmited list of topics that will published before and after the request, and on errors</td> </tr> <tr> <td align="left" valign="top">onblur</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html?view=diff&rev=520251&r1=520250&r2=520251 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html Mon Mar 19 20:19:36 2007 @@ -44,6 +44,14 @@ <td align="left" valign="top">Set action attribute.</td> </tr> <tr> + <td align="left" valign="top">afterNotifyTopics</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Comma delimmited list of topics that will published after the request(if the request succeeds)</td> + </tr> + <tr> <td align="left" valign="top">align</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -52,6 +60,14 @@ <td align="left" valign="top">HTML align attribute.</td> </tr> <tr> + <td align="left" valign="top">beforeNotifyTopics</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Comma delimmited list of topics that will published before the request</td> + </tr> + <tr> <td align="left" valign="top">cssClass</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -76,6 +92,14 @@ <td align="left" valign="top">Set the html disabled attribute on rendered html element</td> </tr> <tr> + <td align="left" valign="top">errorNotifyTopics</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Comma delimmited list of topics that will published after the request(if the request fails)</td> + </tr> + <tr> <td align="left" valign="top">errorText</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -201,15 +225,7 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Topics that will published when the remote call completes</td> - </tr> - <tr> - <td align="left" valign="top">onLoadJS</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">true</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'notifyTopics'. Javascript code execute after reload</td> + <td align="left" valign="top">Comma delimmited list of topics that will published before and after the request, and on errors</td> </tr> <tr> <td align="left" valign="top">onblur</td> @@ -322,14 +338,6 @@ <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> <td align="left" valign="top">Set the html onselect attribute on rendered html element</td> - </tr> - <tr> - <td align="left" valign="top">preInvokeJS</td> - <td align="left" valign="top">false</td> - <td align="left" valign="top"></td> - <td align="left" valign="top">true</td> - <td align="left" valign="top">String</td> - <td align="left" valign="top">Deprecated. Use 'notifyTopics'. Javascript code execute before reload</td> </tr> <tr> <td align="left" valign="top">required</td>