Version 0.6.48, fix X.UA for s60 Safari.

[pettanr/clientJs.git] / 0.6.x / js / dom / 12_XDomEvent.js

diff --git a/0.6.x/js/dom/12_XDomEvent.js b/0.6.x/js/dom/12_XDomEvent.js
index 2fc5817..8ffb26d 100644 (file)
--- a/0.6.x/js/dom/12_XDomEvent.js
+++ b/0.6.x/js/dom/12_XDomEvent.js
@@ -217,6 +217,17 @@ X.Dom.Node.prototype._addEvent =
                                raw.addEventListener( type, this._handleEvent, false );\r
                        };\r
                }) :\r
+       X.Dom.EVENT_W3C && X.UA.Opera7 ?\r
+               (function( type ){\r
+                       var raw = this._rawNode;\r
+                       if( !raw ) return;\r
+                       this._handleEvent = this._handleEvent || X.Callback.create( this );\r
+                       if( raw === window ){\r
+                               raw[ 'on' + type ] = this._handleEvent;\r
+                       } else {\r
+                               raw.addEventListener( type, this._handleEvent, false );\r
+                       };\r
+               }) :\r
        X.Dom.EVENT_W3C ?\r
                (function( type ){\r
                        this._rawNode && this._rawNode.addEventListener( X.Dom.Event.Rename[ type ] || type, this, false );\r
@@ -228,7 +239,7 @@ X.Dom.Node.prototype._addEvent =
                        this._rawNode.attachEvent( 'on' + type, this._handleEvent );\r
                }) :\r
                (function( type ){\r
-                       var elm = this._ie4getRawNode();\r
+                       var elm = this._rawNode || ( this._ie4getRawNode && this._ie4getRawNode() );\r
                        if( !elm ) return;\r
                        this._handleEvent = elm[ 'on' + type ] = this._handleEvent || X.Callback.create( this );\r
                });\r
@@ -261,6 +272,21 @@ X.Dom.Node.prototype._removeEvent =
                                delete this._handleEvent;\r
                        };\r
                }) :\r
+       X.Dom.EVENT_W3C && X.UA.Opera7 ?\r
+               (function( type ){\r
+                       var raw = this._rawNode;\r
+                       if( !raw ) return;\r
+                       \r
+                       if( raw === window ){\r
+                               raw[ 'on' + type ] = null;\r
+                       } else {\r
+                               raw.removeEventListener( type, this._handleEvent, false );\r
+                       };\r
+                       if( !this._listeners ){\r
+                               X.Callback._correct( this._handleEvent );\r
+                               delete this._handleEvent;\r
+                       };\r
+               }) :\r
        X.Dom.EVENT_W3C ?\r
                (function( type ){\r
                        var elm = this._rawNode;\r
@@ -278,7 +304,7 @@ X.Dom.Node.prototype._removeEvent =
                        };\r
                }) :\r
                (function( type ){\r
-                       var elm = this._rawNode || this._ie4getRawNode();\r
+                       var elm = this._rawNode || ( this._ie4getRawNode && this._ie4getRawNode() );\r
                        if( !elm ) return;\r
                        elm[ 'on' + type ] = X.emptyFunction;\r
                        elm[ 'on' + type ] = '';\r
@@ -379,12 +405,9 @@ if( X.UA.WebKit || ( X.UA.Safari && X.UA.Safari < 3 ) ){ // sniff
                if( 'loaded|complete'.indexOf( document.readyState ) !== -1 ) return X.Dom._init();\r
        });\r
 };\r
-       /* for other browsers */\r
-       Node._window.listenOnce( 'load', X.Dom._init ); \r
-\r
-\r
-\r
 \r
+/* for other browsers */\r
+Node._window.listenOnce( 'load', X.Dom._init );\r
 //\r
 X.Dom.listenOnce( X.Dom.Event.XDOM_READY, function(e){\r
        console.log( 'X.Dom XDomReady ' + X.Dom.readyState );\r