dmkarr      2002/11/17 12:53:31

  Modified:    contrib/struts-el/doc/userGuide struts-html-el.xml
               contrib/struts-el/src/share/org/apache/strutsel/taglib/html
                        ELBaseTag.java
  Log:
  Copying recent base taglib additions into struts-el:
  Adding "server" attribute to "html-el:base" tag.
  Adding "html-el:xhtml" tag.
  
  The latter change just required adding a "tag" element, and no new code.  I'm
  just using the Struts class, as the tag has no attributes.  If it ever gets any
  attributes, a subclass would have to be written.
  
  Revision  Changes    Path
  1.9       +32 -7     
jakarta-struts/contrib/struts-el/doc/userGuide/struts-html-el.xml
  
  Index: struts-html-el.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/contrib/struts-el/doc/userGuide/struts-html-el.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- struts-html-el.xml        4 Nov 2002 02:33:26 -0000       1.8
  +++ struts-html-el.xml        17 Nov 2002 20:53:31 -0000      1.9
  @@ -61,6 +61,14 @@
                 <p>The window target for this base reference.</p>
               </info>
             </attribute>
  +          <attribute>
  +            <name>server</name>
  +            <required>false</required>
  +            <rtexprvalue>false</rtexprvalue>
  +            <info>
  +              <p>The server name to use instead of request.getServerName().</p>
  +            </info>
  +          </attribute>
   
           </tag>
   
  @@ -2569,7 +2577,7 @@
                   <attribute>
                       <name>onclick</name>
                       <required>false</required>
  -                    <rtexprvalue>true</rtexprvalue>
  +                    <rtexprvalue>false</rtexprvalue>
                       <info>
                           JavaScript event handler executed when this element 
receives a
                           mouse click.
  @@ -2579,7 +2587,7 @@
                   <attribute>
                       <name>ondblclick</name>
                       <required>false</required>
  -                    <rtexprvalue>true</rtexprvalue>
  +                    <rtexprvalue>false</rtexprvalue>
                       <info>
                           JavaScript event handler executed when this element 
receives a
                           mouse double click.
  @@ -2619,7 +2627,7 @@
                   <attribute>
                       <name>onmousedown</name>
                       <required>false</required>
  -                    <rtexprvalue>true</rtexprvalue>
  +                    <rtexprvalue>false</rtexprvalue>
                       <info>
                           JavaScript event handler executed when this element is 
under the mouse
                           pointer and a mouse button is depressed.
  @@ -2629,7 +2637,7 @@
                   <attribute>
                       <name>onmousemove</name>
                       <required>false</required>
  -                    <rtexprvalue>true</rtexprvalue>
  +                    <rtexprvalue>false</rtexprvalue>
                       <info>
                           JavaScript event handler executed when this element is 
under the
                           mouse pointer and the pointer is moved.
  @@ -2639,7 +2647,7 @@
                   <attribute>
                       <name>onmouseout</name>
                       <required>false</required>
  -                    <rtexprvalue>true</rtexprvalue>
  +                    <rtexprvalue>false</rtexprvalue>
                       <info>
                           JavaScript event handler executed when this element was 
under the
                           mouse pointer but the pointer was moved outside the element.
  @@ -2649,7 +2657,7 @@
                   <attribute>
                       <name>onmouseover</name>
                       <required>false</required>
  -                    <rtexprvalue>true</rtexprvalue>
  +                    <rtexprvalue>false</rtexprvalue>
                       <info>
                           JavaScript event handler executed when this element was not 
under
                           the mouse pointer but the pointer is moved inside the 
element.
  @@ -2659,7 +2667,7 @@
                   <attribute>
                       <name>onmouseup</name>
                       <required>false</required>
  -                    <rtexprvalue>true</rtexprvalue>
  +                    <rtexprvalue>false</rtexprvalue>
                       <info>
                           JavaScript event handler executed when this element is 
under the
                           mouse pointer and a mouse button is released.
  @@ -6564,6 +6572,23 @@
   
   
       </tag>
  +
  +    <tag>
  +          <name>xhtml</name>
  +          <summary>Render HTML tags as XHTML</summary>
  +          <tagclass>org.apache.struts.taglib.html.XhtmlTag</tagclass>
  +          <bodycontent>empty</bodycontent>
  +          <info>
  +          <p>
  +             Using this tag in a page tells all other html taglib tags
  +             to render themselves as XHTML.  This is really only useful
  +             when composing pages with jsp includes.  Using 
  +             &lt;html-el:html xhtml="true"&gt; will accomplish the same thing
  +             as this tag but only works for complete pages or tiles.
  +          </p>
  +          </info>
  +
  +        </tag>
   
   </taglib>
   </body>
  
  
  
  1.4       +10 -4     
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELBaseTag.java
  
  Index: ELBaseTag.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELBaseTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ELBaseTag.java    1 Oct 2002 04:25:49 -0000       1.3
  +++ ELBaseTag.java    17 Nov 2002 20:53:31 -0000      1.4
  @@ -130,5 +130,11 @@
           } catch (NullAttributeException ex) {
               setTarget(null);
           }
  +
  +        try {
  +            setServer((String) evalAttr("server", getServer(), String.class));
  +        } catch (NullAttributeException ex) {
  +            setServer(null);
  +        }
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to