JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
vanilla ckeditor-3.6.3
[ckeditor.git] / _source / core / dom / domobject.js
index d37790f..e342dc8 100644 (file)
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -84,10 +84,10 @@ CKEDITOR.dom.domObject.prototype = (function()
                        {\r
                                var listener = nativeListeners[ eventName ] = getNativeListener( this, eventName );\r
 \r
-                               if ( this.$.attachEvent )\r
-                                       this.$.attachEvent( 'on' + eventName, listener );\r
-                               else if ( this.$.addEventListener )\r
+                               if ( this.$.addEventListener )\r
                                        this.$.addEventListener( eventName, listener, !!CKEDITOR.event.useCapture );\r
+                               else if ( this.$.attachEvent )\r
+                                       this.$.attachEvent( 'on' + eventName, listener );\r
                        }\r
 \r
                        // Call the original implementation.\r
@@ -107,10 +107,10 @@ CKEDITOR.dom.domObject.prototype = (function()
                                var listener = nativeListeners && nativeListeners[ eventName ];\r
                                if ( listener )\r
                                {\r
-                                       if ( this.$.detachEvent )\r
-                                               this.$.detachEvent( 'on' + eventName, listener );\r
-                                       else if ( this.$.removeEventListener )\r
+                                       if ( this.$.removeEventListener )\r
                                                this.$.removeEventListener( eventName, listener, false );\r
+                                       else if ( this.$.detachEvent )\r
+                                               this.$.detachEvent( 'on' + eventName, listener );\r
 \r
                                        delete nativeListeners[ eventName ];\r
                                }\r