Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.4.2
[ckeditor.git]
/
_source
/
core
/
dom
/
domobject.js
diff --git
a/_source/core/dom/domobject.js
b/_source/core/dom/domobject.js
index
f10db99
..
bb029e0
100644
(file)
--- a/
_source/core/dom/domobject.js
+++ b/
_source/core/dom/domobject.js
@@
-84,10
+84,10
@@
CKEDITOR.dom.domObject.prototype = (function()
{
\r
var listener = nativeListeners[ eventName ] = getNativeListener( this, eventName );
\r
\r
{
\r
var listener = nativeListeners[ eventName ] = getNativeListener( this, eventName );
\r
\r
- if ( this.$.addEventListener )
\r
- this.$.addEventListener( eventName, listener, !!CKEDITOR.event.useCapture );
\r
- else if ( this.$.attachEvent )
\r
+ if ( this.$.attachEvent )
\r
this.$.attachEvent( 'on' + eventName, listener );
\r
this.$.attachEvent( 'on' + eventName, listener );
\r
+ else if ( this.$.addEventListener )
\r
+ this.$.addEventListener( eventName, listener, !!CKEDITOR.event.useCapture );
\r
}
\r
\r
// Call the original implementation.
\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
var listener = nativeListeners && nativeListeners[ eventName ];
\r
if ( listener )
\r
{
\r
- if ( this.$.removeEventListener )
\r
- this.$.removeEventListener( eventName, listener, false );
\r
- else if ( this.$.detachEvent )
\r
+ if ( this.$.detachEvent )
\r
this.$.detachEvent( 'on' + eventName, listener );
\r
this.$.detachEvent( 'on' + eventName, listener );
\r
+ else if ( this.$.removeEventListener )
\r
+ this.$.removeEventListener( eventName, listener, false );
\r
\r
delete nativeListeners[ eventName ];
\r
}
\r
\r
delete nativeListeners[ eventName ];
\r
}
\r
@@
-128,10
+128,10
@@
CKEDITOR.dom.domObject.prototype = (function()
for ( var eventName in nativeListeners )
\r
{
\r
var listener = nativeListeners[ eventName ];
\r
for ( var eventName in nativeListeners )
\r
{
\r
var listener = nativeListeners[ eventName ];
\r
- if ( this.$.removeEventListener )
\r
- this.$.removeEventListener( eventName, listener, false );
\r
- else if ( this.$.detachEvent )
\r
+ if ( this.$.detachEvent )
\r
this.$.detachEvent( 'on' + eventName, listener );
\r
this.$.detachEvent( 'on' + eventName, listener );
\r
+ else if ( this.$.removeEventListener )
\r
+ this.$.removeEventListener( eventName, listener, false );
\r
\r
delete nativeListeners[ eventName ];
\r
}
\r
\r
delete nativeListeners[ eventName ];
\r
}
\r
@@
-238,7
+238,11
@@
CKEDITOR.dom.domObject.prototype = (function()
};
\r
\r
/**
\r
};
\r
\r
/**
\r
- * @name CKEDITOR.dom.domObject.prototype.getCustomData
\r
+ * Gets an ID that can be used to identiquely identify this DOM object in
\r
+ * the running session.
\r
+ * @name CKEDITOR.dom.domObject.prototype.getUniqueId
\r
+ * @function
\r
+ * @returns {Number} A unique ID.
\r
*/
\r
domObjectProto.getUniqueId = function()
\r
{
\r
*/
\r
domObjectProto.getUniqueId = function()
\r
{
\r