Ticket #8433: 8433.patch

_source/core/dom/domobject.js

@@ -84 +84 @@
                         {
                                 var listener = nativeListeners[ eventName ] = getNativeListener( this, eventName );
 
-                                if ( this.$.attachEvent )
+                                 if ( this.$.addEventListener )
+                                        this.$.addEventListener( eventName, listener, !!CKEDITOR.event.useCapture );
+                                 else if ( this.$.attachEvent )
                                         this.$.attachEvent( 'on' + eventName, listener );
-                                else if ( this.$.addEventListener )
-                                        this.$.addEventListener( eventName, listener, !!CKEDITOR.event.useCapture );
+
                         }
 
                         // Call the original implementation.
@@ -107 +108 @@
                                 var listener = nativeListeners && nativeListeners[ eventName ];
                                 if ( listener )
                                 {
-                                        if ( this.$.detachEvent )
+                                        if ( this.$.removeEventListener )
+                                                this.$.removeEventListener( eventName, listener, false );
+                                        else if ( this.$.detachEvent )
                                                 this.$.detachEvent( 'on' + eventName, listener );
-                                        else if ( this.$.removeEventListener )
-                                                this.$.removeEventListener( eventName, listener, false );
-
                                         delete nativeListeners[ eventName ];
                                 }
                         }
@@ -128 +128 @@
                         for ( var eventName in nativeListeners )
                         {
                                 var listener = nativeListeners[ eventName ];
-                                if ( this.$.detachEvent )
+                                if ( this.$.removeEventListener )
+                                        this.$.removeEventListener( eventName, listener, false );
+                                else if ( this.$.detachEvent )
                                         this.$.detachEvent( 'on' + eventName, listener );
-                                else if ( this.$.removeEventListener )
-                                        this.$.removeEventListener( eventName, listener, false );
 
                                 delete nativeListeners[ eventName ];
                         }