2009/dap/ReSpec.js/js respec.js,1.124,1.125

Update of /sources/public/2009/dap/ReSpec.js/js
In directory hutz:/tmp/cvs-serv6287/js

Modified Files:
	respec.js 
Log Message:
fix acronym/abbr bug

Index: respec.js
===================================================================
RCS file: /sources/public/2009/dap/ReSpec.js/js/respec.js,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- respec.js	23 Jun 2010 17:49:23 -0000	1.124
+++ respec.js	24 Jun 2010 12:35:54 -0000	1.125
@@ -637,32 +637,33 @@
     makeSotD:     function () {
         var sotd;
         var mat = (this.status2maturity[this.specStatus]) ? this.status2maturity[this.specStatus] : this.specStatus;
+        var custom = document.getElementById("sotd");
 
         if (this.specStatus == "unofficial") {
             sotd = "<section id='sotd' class='introductory'><h2>Status of This Document</h2>" +
             "<p>This document is merely a public working draft of a potential specification. It has " +
             "no official standing of any kind and does not represent the support or consensus of any " +
-            "standards organisation.</p></section>"
+            "standards organisation.</p>";
+            if (custom) sotd += custom.innerHTML;
+            sotd += "</section>";
         }
         else if (this.isNoTrack) {
             var mc = (this.specStatus == "MO") ? " member-confidential" : "";
             sotd = "<section id='sotd' class='introductory'><h2>Status of This Document</h2>" +
                 "<p>This document is merely a W3C-internal" + mc + " document. It has no "+
-                "official standing of any kind and does not represent consensus of the W3C Membership.</p></section>";
+                "official standing of any kind and does not represent consensus of the W3C Membership.</p>";
+            if (custom) sotd += custom.innerHTML;
+            sotd += "</section>";
         }
         else {
             var art = "a ";
-            var custom = document.getElementById("sotd");
             if (this.specStatus == "ED" || this.specStatus == "XGR" || this.specStatus == "IG-NOTE") art = "an ";
             sotd = "<section id='sotd' class='introductory'><h2>Status of This Document</h2>" +
                 "<p><em>This section describes the status of this document at the time of its publication. Other " +
                 "documents may supersede this document. A list of current W3C publications and the latest revision " +
                 "of this technical report can be found in the <a href='http://www.w3.org/TR/'>W3C technical reports " +
                 "index</a> at http://www.w3.org/TR/.</em></p>";
-            if (custom) {
-                sotd += custom.innerHTML;
-                custom.parentNode.removeChild(custom);
-            }
+            if (custom) sotd += custom.innerHTML;
             sotd +=
                 "<p>This document was published by the <a href='" + this.wgURI + "'>" + this.wg + "</a> as " + art + this.status2long[this.specStatus] + ".";
             if (this.isRecTrack && this.specStatus != "REC") sotd += " This document is intended to become a W3C Recommendation.";
@@ -699,6 +700,7 @@
                 "information in accordance with <a href='http://www.w3.org/Consortium/Patent-Policy-20040205/#sec-Disclosure'>section " +
                 "6 of the W3C Patent Policy</a>.</p></section>";
         }
+        if (custom) custom.parentNode.removeChild(custom);
 
         var tmp = sn.element("div");
         tmp.innerHTML = sotd;
@@ -923,11 +925,14 @@
                     }
                     // ABBR
                     else if (abbrMap[matched]) {
-                        sn.element("abbr", { title: abbrMap[matched] }, df, matched);
+                        if (sn.findNodes("ancestor::abbr", txt)) sn.text(matched, df);
+                        else sn.element("abbr", { title: abbrMap[matched] }, df, matched);
                     }
                     // ACRO
                     else if (acroMap[matched]) {
-                        sn.element("acronym", { title: acroMap[matched] }, df, matched);
+                        if (sn.findNodes("ancestor::acronym", txt)) sn.text(matched, df);
+                        else sn.element("acronym", { title: acroMap[matched] }, df, matched);
+                        // sn.element("acronym", { title: acroMap[matched] }, df, matched);
                     }
                     // FAIL
                     else {

Received on Thursday, 24 June 2010 12:35:58 UTC