more refactoring of event.js; got basic log view working

drnic · Feb 17, 2008 · ca01e1a · ca01e1a
1 parent 5dfe3b3
commit ca01e1a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/prototype/event.js b/src/prototype/event.js
@@ -1,7 +1,9 @@
 DrNicTest.Event = {};
+DrNicTest.Event.cache = { };
 DrNicTest.Event.observe = function(element, eventName, handler) {
+  var cache = DrNicTest.Event.cache;
   function getDOMEventName(eventName) {
-    if (eventName && eventName.include(':')) return "dataavailable";
+    if (eventName && eventName.indexOf(':') > -1) return "dataavailable";
     return eventName;
   };
 
@@ -12,7 +14,7 @@ DrNicTest.Event.observe = function(element, eventName, handler) {
   }
 
   function getDOMEventName(eventName) {
-    if (eventName && eventName.include(':')) return "dataavailable";
+    if (eventName && eventName.indexOf(':') > -1) return "dataavailable";
     return eventName;
   }
 
@@ -28,7 +30,11 @@ DrNicTest.Event.observe = function(element, eventName, handler) {
   function createWrapper(element, eventName, handler) {
     var id = getEventID(element);
     var c = getWrappersForEventName(id, eventName);
-    if (c.pluck("handler").include(handler)) return false;
+    var handlers = [];
+    for (wrapper in c) {
+      handlers.push(wrapper.handler);
+    }
+    if (handlers.indexOf(handler) > -1) return false;
 
     var wrapper = function(event) {
       if (!Event || !Event.extend ||
@@ -44,7 +50,7 @@ DrNicTest.Event.observe = function(element, eventName, handler) {
     return wrapper;
   }
 
-  element = $(element);
+  element = DrNicTest.$(element);
   var name = getDOMEventName(eventName);
 
   var wrapper = createWrapper(element, eventName, handler);

diff --git a/test/functional/jsunittest_test.html b/test/functional/jsunittest_test.html
@@ -194,7 +194,7 @@ <h1>Original PrototypeJS UnitTest test file</h1>
 
   });
 
-  new Test.Unit.Runner({
+  new DrNicTest.Unit.Runner({
     testDummy: function() { with(this) {
       assert(true);
     }},