Changeset 449

Timestamp:

01/18/06 21:56:30 (7 years ago)

Author:

mokhet

Message:

apply patch for ticket #654 with a few updates to satisfy BSD-Style Bracing

Files:

• trunk/htmlarea.js (modified) (2 diffs)

trunk/htmlarea.js

@@ -4451 +4451 @@
 };
 
-HTMLArea._addEvent = function(el, evname, func) {
-  if (HTMLArea.is_ie) {
+if (document.addEventListener)
+{
+  HTMLArea._addEvent = function(el, evname, func)
+  {
+    el.addEventListener(evname, func, true);
+    HTMLArea._eventFlushers.push([el, evname, func]);
+  };
+  HTMLArea._removeEvent = function(el, evname, func)
+  {
+    el.removeEventListener(evname, func, true);
+  };
+  HTMLArea._stopEvent = function(ev)
+  {
+    ev.preventDefault();
+    ev.stopPropagation();
+  };
+}
+else if (document.attachEvent)
+{
+  HTMLArea._addEvent = function(el, evname, func)
+  {
     el.attachEvent("on" + evname, func);
-  } else {
-    el.addEventListener(evname, func, true);
-  }
-  HTMLArea._eventFlushers.push([el, evname, func]);
-};
+    HTMLArea._eventFlushers.push([el, evname, func]);
+  };
+  HTMLArea._removeEvent = function(el, evname, func)
+  {
+    el.detachEvent("on" + evname, func);
+  };
+  HTMLArea._stopEvent = function(ev)
+  {
+    try
+    {
+      ev.cancelBubble = true;
+      ev.returnValue = false;
+    }
+    catch(e)
+    {
+      // Perhaps we could try here to stop the window.event
+      // window.event.cancelBubble = true;
+      // window.event.returnValue = false;
+    }
+  };
+}
+else
+{
+  HTMLArea._addEvent = function(el, evname, func)
+  {
+    alert('_addEvent is not supported');
+  };
+  HTMLArea._removeEvent = function(el, evname, func)
+  {
+    alert('_removeEvent is not supported');
+  };
+  HTMLArea._stopEvent = function(ev)
+  {
+    alert('_stopEvent is not supported');
+  };
+}
 
 HTMLArea._addEvents = function(el, evs, func) {
@@ -4466 +4516 @@
 };
 
-HTMLArea._removeEvent = function(el, evname, func) {
-  if (HTMLArea.is_ie) {
-    el.detachEvent("on" + evname, func);
-  } else {
-    el.removeEventListener(evname, func, true);
-  }
-};
-
 HTMLArea._removeEvents = function(el, evs, func) {
   for (var i = evs.length; --i >= 0;) {
     HTMLArea._removeEvent(el, evs[i], func);
-  }
-};
-
-HTMLArea._stopEvent = function(ev) {
-  if (HTMLArea.is_ie) {
-    try{
-      ev.cancelBubble = true;
-      ev.returnValue = false;
-    } catch(e){}
-  } else {
-    ev.preventDefault();
-    ev.stopPropagation();
   }
 };