Merge pull request #4747 from arjantijms/3_0_fix_docs

Fixes for doc rendering
eclipse-ee4j · Oct 5, 2020 · a6e7913 · a6e7913
2 parents 18042f7 + 0fc79ee
commit a6e7913
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/impl/src/main/resources/META-INF/resources/jakarta.faces/jsf-uncompressed.js b/impl/src/main/resources/META-INF/resources/jakarta.faces/jsf-uncompressed.js
@@ -3168,19 +3168,16 @@ if (!((jsf && jsf.specversion && jsf.specversion >= 23000 ) &&
     /**
      * <p class="changed_added_2_2">Return the windowId of the window
      * in which the argument form is rendered.</p>
-
-     * @param {optional String|DomNode} node. Determine the nature of
+     *
+     * @param {DomNode} node Determine the nature of
      * the argument.  If not present, search for the windowId within
      * <code>document.forms</code>.  If present and the value is a
      * string, assume the string is a DOM id and get the element with
      * that id and start the search from there.  If present and the
      * value is a DOM element, start the search from there.
-
      * @returns String The windowId of the current window, or null 
      *  if the windowId cannot be determined.
-
      * @throws an error if more than one unique WindowId is found.
-
      * @function jsf.getClientWindow
      */
     jsf.getClientWindow = function(node) {

diff --git a/impl/src/main/resources/com/sun/faces/metadata/taglib/html_basic.taglib.xml b/impl/src/main/resources/com/sun/faces/metadata/taglib/html_basic.taglib.xml
@@ -53,9 +53,7 @@
             "disabled" attribute is specified, do not render the "onclick" element and assign the
             "disabled" attribute a value of true.</div>]]>
         </description>
-        <tag-name>
-            button
-        </tag-name>
+        <tag-name>button</tag-name>
         <component>
             <component-type>jakarta.faces.HtmlOutcomeTargetButton</component-type>
             <renderer-type>jakarta.faces.Button</renderer-type>
@@ -571,9 +569,7 @@
             of the "class" attribute on the "span".  Render any pass-through attributes
             on the "span".</div>]]>
         </description>
-        <tag-name>
-            link
-        </tag-name>
+        <tag-name>link</tag-name>
         <component>
             <component-type>jakarta.faces.HtmlOutcomeTargetLink</component-type>
             <renderer-type>jakarta.faces.Link</renderer-type>
@@ -1182,9 +1178,7 @@
 
            ]]>
         </description>
-        <tag-name>
-            head
-        </tag-name>
+        <tag-name>head</tag-name>
         <component>
             <component-type>jakarta.faces.Output</component-type>
             <renderer-type>jakarta.faces.Head</renderer-type>
@@ -1274,9 +1268,7 @@
 
           ]]>
         </description>
-        <tag-name>
-            body
-        </tag-name>
+        <tag-name>body</tag-name>
         <component>
             <component-type>jakarta.faces.Output</component-type>
             <renderer-type>jakarta.faces.Body</renderer-type>
@@ -6725,9 +6717,7 @@
             
             </div>]]>
         </description>
-        <tag-name>
-            outputStylesheet
-        </tag-name>
+        <tag-name>outputStylesheet</tag-name>
         <component>
             <component-type>jakarta.faces.Output</component-type>
             <renderer-type>jakarta.faces.resource.Stylesheet</renderer-type>
@@ -7145,9 +7135,7 @@
             
             </div>]]>
         </description>
-        <tag-name>
-            outputScript
-        </tag-name>
+        <tag-name>outputScript</tag-name>
         <component>
             <component-type>jakarta.faces.Output</component-type>
             <renderer-type>jakarta.faces.resource.Script</renderer-type>