Make dfn.js work for headings

Fixes #26.
whatwg · Nov 22, 2016 · 7222360 · 7222360
1 parent 86c6b95
commit 7222360
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/dfn.js b/dfn.js
@@ -2,8 +2,6 @@
 // makes <dfn> elements link back to all uses of the term
 // no copyright is asserted on this file
 
-var dfnTimer = new Date();
-
 var dfnMapTarget = -1;
 var dfnMapDone = false;
 var dfnMap = {};
@@ -19,7 +17,7 @@ function initDfn() {
     var start = new Date();
     while (k < dfnMapTarget) {
       if (links[k].hash.length > 1) {
-        if (!links[k].closest('.no-backref, .self-link, ul.index, #idl-index + pre')) {
+        if (!links[k].closest('.no-backref, .self-link, ul.index, #idl-index + pre, ol.toc')) {
           var s;
           if (links[k].hasAttribute('data-x-internal'))
             s = links[k].getAttribute('data-x-internal')
@@ -45,8 +43,6 @@ function initDfn() {
     }
     dfnMapDone = true;
     document.body.className += " dfnEnabled";
-    //if (getCookie('profile') == '1')
-    //  document.getElementsByTagName('h2')[0].textContent += '; dfn.js: ' + (new Date() - dfnTimer) + 'ms to do ' + dfnMapTarget + ' links in ' + n + ' loops';
   }
   initDfnInternal();
 }
@@ -66,7 +62,7 @@ function dfnShow(event) {
   }
   if (dfnMapDone) {
     var node = event.target;
-    while (node && (node.nodeType != event.target.ELEMENT_NODE || node.tagName != "DFN"))
+    while (node && (!node instanceof HTMLElement || !(node.localName == 'dfn' || (node instanceof HTMLHeadingElement && node.hasAttribute('data-dfn-type')))))
       node = node.parentNode;
     if (node) {
       event.preventDefault();
@@ -175,9 +171,9 @@ function dfnMovePanel(event) {
 function dfnGetCaption(link) {
   var node = link;
   while (node) {
-    if (node.nodeType == node.ELEMENT_NODE && node.tagName.match(/^H[1-6]$/)) {
+    if (node instanceof HTMLHeadingElement) {
       return node;
-    } else if (node.nodeType == node.ELEMENT_NODE && node.tagName == 'NAV') {
+    } else if (node instanceof HTMLElement && node.localName == 'nav') {
       return 'Navigation';
     } else if (!node.previousSibling) {
       node = node.parentNode;

diff --git a/standard.css b/standard.css
@@ -289,7 +289,7 @@ html:not(.split) #multipage-link { animation: 10s ease 0s 1 stand-out; }
 p.copyright { text-align: center; }
 p.copyright > span { display: inline-block; border: none; }
 
-body.dfnEnabled dfn { cursor: pointer; }
+body.dfnEnabled dfn, body.dfnEnabled h2[data-dfn-type], body.dfnEnabled h3[data-dfn-type], body.dfnEnabled h4[data-dfn-type], body.dfnEnabled h5[data-dfn-type], body.dfnEnabled h6[data-dfn-type] { cursor: pointer; }
 .dfnPanel {
   display: inline;
   position: absolute;