Revert "Made it more independent of query"

This reverts commit ec28558.
gauthierm · May 15, 2012 · 42c0bd5 · 42c0bd5
1 parent ec28558
commit 42c0bd5
Showing 1 changed file with 33 additions and 30 deletions.
diff --git a/media/js/tabzilla.js b/media/js/tabzilla.js
@@ -249,26 +249,6 @@ Tabzilla.init = function()
         Tabzilla.toggle();
     });
 
-    Tabzilla.addEventListener(Tabzilla.link, 'keypress', function(e) {
-        if (e.keyCode === 32) {
-            Tabzilla.toggle();
-            Tabzilla.preventDefault(e);
-        }
-    });
-
-    Tabzilla.addEventListener(Tabzilla.panel, 'keypress', function(e) {
-        if (e.keyCode === 13) {
-            Tabzilla.toggle();
-            Tabzilla.$link.focus();
-        }
-    });
-
-    Tabzilla.addEventListener(document, 'keydown', function(e) {
-        if (e.keyCode === 27 && Tabzilla.opened) {
-            Tabzilla.toggle();
-        }
-    });
-
     Tabzilla.$panel = jQuery(Tabzilla.panel);
     Tabzilla.$link  = jQuery(Tabzilla.link);
 
@@ -277,14 +257,33 @@ Tabzilla.init = function()
     Tabzilla.$panel.removeClass('tabzilla-opened');
     Tabzilla.$link.removeClass('tabzilla-opened');
 
-    Tabzilla.panel.setAttribute("tabIndex", "-1");
-    Tabzilla.link.setAttribute("role", "button");
-    Tabzilla.link.setAttribute("aria-expanded", "false");
-    Tabzilla.link.setAttribute("aria-controls", Tabzilla.panel.id);
-    Tabzilla.link.setAttribute("title", Tabzilla.LINK_TITLE.CLOSED);
+    Tabzilla.$panel.attr("tabindex","-1");
+    Tabzilla.$link.attr({
+        "role": "button",
+        "aria-expanded": "false",
+        "aria-controls": Tabzilla.$panel.attr("id"),
+        "title": Tabzilla.LINK_TITLE.CLOSED
+    });
 
     Tabzilla.opened = false;
 
+    jQuery(document).keydown(function(e) {
+        if (e.which === 27 && Tabzilla.opened) {
+            Tabzilla.toggle();
+        }
+    });
+    Tabzilla.$link.keypress(function(e) {
+        if (e.which === 32) {
+            Tabzilla.toggle();
+            Tabzilla.preventDefault(e);
+        }
+    });
+    Tabzilla.$panel.keypress(function(e) {
+        if (e.which === 13) {
+            Tabzilla.toggle();
+            Tabzilla.$link.focus();
+        }
+    });
 };
 
 Tabzilla.buildPanel = function()
@@ -338,9 +337,11 @@ Tabzilla.open = function()
         jQuery(Tabzilla.panel).animate({ height: 200 }, 200, 'easeInOut').toggleClass("open");;
     }
 
-    Tabzilla.link.setAttribute("aria-expanded", "true");
-    Tabzilla.link.setAttribute("title", Tabzilla.LINK_TITLE.OPENED);
-    Tabzilla.panel.focus();
+    Tabzilla.$link.attr({
+        "aria-expanded": "true",
+        "title": Tabzilla.LINK_TITLE.OPENED
+    });
+    Tabzilla.$panel.focus();
     Tabzilla.opened = true;
 };
 
@@ -363,8 +364,10 @@ Tabzilla.close = function()
 
     }
 
-    Tabzilla.link.setAttribute("aria-expanded", "false");
-    Tabzilla.link.setAttribute("title", Tabzilla.LINK_TITLE.CLOSED);
+    Tabzilla.$link.attr({
+        "aria-expanded": "false",
+        "title": Tabzilla.LINK_TITLE.CLOSED
+    });
     Tabzilla.opened = false;
 };