W3C home > Mailing lists > Public > public-html-commits@w3.org > May 2011

html5/markup/js dfn.js,1.14,1.15 jump-indexes.js,1.14,1.15

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Sun, 08 May 2011 12:43:58 +0000
To: public-html-commits@w3.org
Message-Id: <E1QJ3L4-00086e-EF@lionel-hutz.w3.org>
Update of /sources/public/html5/markup/js
In directory hutz:/tmp/cvs-serv30860/js

Modified Files:
	dfn.js jump-indexes.js 
Log Message:
make jump indexes keyboard operable


Index: jump-indexes.js
===================================================================
RCS file: /sources/public/html5/markup/js/jump-indexes.js,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jump-indexes.js	30 Apr 2011 12:33:24 -0000	1.14
+++ jump-indexes.js	8 May 2011 12:43:56 -0000	1.15
@@ -1,14 +1,28 @@
 // No copyright is asserted on this file.
 
 var jumpIndexA;
-document.addEventListener('click', showjumpIndexA, false);
-document.addEventListener("keyup", function(e) {
-  if(!e) e=window.event;
+document.addEventListener('click', window.showjumpIndexA, false);
+document.addEventListener("keydown", function (e) {
+  if (!e) {
+    e = window.event;
+  }
   var key = e.keyCode ? e.keyCode : e.which;
-  if ( key == 27 && jumpIndexA) {
+  if (key === 27 && jumpIndexA) {
+    document.getElementById('jumpIndexA-button').firstChild.textContent = "jump";
     jumpIndexA.parentNode.removeChild(jumpIndexA);
     jumpIndexA = null;
   }
+  if ((key === 32 || key === 13) && !jumpIndexA) {
+    window.showjumpIndexA(e);
+    if (e.target.id === "jumpIndexA-button") {
+      console.log("FOO");
+      e.preventDefault();
+      e.stopPropagation();
+      e.returnValue = false;
+      e.cancelBubble = true;
+      return false;
+    }
+  }
 }, true);
 
 var itemList =
@@ -27,15 +41,16 @@
   ["strong", "style", "sub", "summary", "sup"],
   ["table", "tbody", "td", "textarea", "tfoot", "th", "thead", "time", "title"],
   [ "tr", "track", "u", "ul", "var", "video", "wbr"],
-  ["global-attributes","index-of-terms","toc","toggle"]
-  ];
+  ["global-attributes", "index-of-terms", "toc", "toggle"]
+];
 
 function showjumpIndexA(event) {
   var node = event.target;
   if (jumpIndexA) {
+    document.getElementById('jumpIndexA-button').firstChild.textContent = "jump";
     jumpIndexA.parentNode.removeChild(jumpIndexA);
     jumpIndexA = null;
-  } else if (node.id == 'jumpIndexA-button') {
+  } else if (event.target.id == 'jumpIndexA-button') {
     var indexDiv = document.createElement('div');
     var items;
     indexDiv.className = 'jumpIndexA';
@@ -100,10 +115,13 @@
       }
       indexDiv.appendChild(p);
     }
-    var posY = event.pageY - 371;
-    var posX = event.pageX - 449;
-    indexDiv.setAttribute("style","top: " + posY+ "px; left: " + posX + "px;");
-    document.getElementById('jump-indexes').appendChild(indexDiv);
+    //var posY = event.pageY - 371;
+    var posY = document.body.scrollTop + 100;
+    //var posX = event.pageX - 449;
+    var posX = document.body.scrollLeft + 100;
+    indexDiv.setAttribute("style","position: relative; top: " + 500 + "px; left: " + 500 + "px;");
+    document.getElementById('jumpIndexA-button').firstChild.textContent = "(ESC to close)";
+    document.getElementById('jumpIndexA-button').appendChild(indexDiv);
     jumpIndexA = indexDiv;
   }
 }

Index: dfn.js
===================================================================
RCS file: /sources/public/html5/markup/js/dfn.js,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- dfn.js	8 May 2011 10:36:45 -0000	1.14
+++ dfn.js	8 May 2011 12:43:56 -0000	1.15
@@ -55,7 +55,7 @@
       }
     }
   }
-  if (key === 32 || key === 13) {
+  if ((key === 32 || key === 13) && !dfnPanel) {
     window.dfnShow(e);
     if (e.target.nodeName === "DFN") {
       e.preventDefault();
Received on Sunday, 8 May 2011 12:44:01 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Sunday, 8 May 2011 12:46:09 GMT