OSDN Git Service

Version 0.6.72, fix vender-prefix@X.DomStyle & X.Dom.Event.
authoritozyun <itozyun@user.sourceforge.jp>
Sun, 31 Aug 2014 09:37:03 +0000 (18:37 +0900)
committeritozyun <itozyun@user.sourceforge.jp>
Sun, 31 Aug 2014 09:37:03 +0000 (18:37 +0900)
0.6.x/js/01_dom/12_XDomEvent.js
0.6.x/js/01_dom/15_XDomStyle.js

index f479338..d0f93ac 100644 (file)
@@ -56,7 +56,7 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
                } else\r
                if( e.wheelDelta !== undefined ){\r
                        this.deltaX = 0;\r
-                       this.deltaY = e.wheelDelta / 120;\r
+                       this.deltaY = -e.wheelDelta / 120;\r
                } else\r
                if( e.detail !== undefined ){\r
                        this.deltaX = 0;\r
@@ -107,7 +107,7 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
                var btn;\r
                \r
                //this._event        = e;\r
-               this.type          = e.type;\r
+               this.type          = X.Dom.Event.RenameTo[ e.type ] || e.type;\r
                this.target        = Node._getXNode( e.srcElement ); // xnode\r
                if( this.target && this.target._xnodeType === 3 ) this.target = this.target.parent; // ie4 の fake Textnode がヒットしていないか?\r
                this.currentTarget = xnode; // xnode\r
@@ -163,7 +163,9 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
                };\r
                this.button      = this.which - 1;\r
                this.deltaX      = 0;\r
-               this.deltaY      = e.wheelDelta / 12;\r
+               this.deltaY      = e.wheelDelta / -12;\r
+               \r
+               if( this.type === 'wheel' ) console.log( e.wheelDelta );\r
        };\r
 };\r
 \r
@@ -307,6 +309,7 @@ X.Dom.Node.prototype._addEvent =
                        var raw = this._rawNode;\r
                        if( !raw ) return;\r
                        this._handleEvent = this._handleEvent || X.Callback.create( this );\r
+                       type = X.Dom.Event.Rename[ type ] || type;\r
                        if( raw.addEventListener ){\r
                                raw.addEventListener( type, this._handleEvent, false );\r
                        } else {\r
@@ -322,6 +325,7 @@ X.Dom.Node.prototype._addEvent =
                (function( type ){\r
                        var raw = this._rawNode;\r
                        if( !raw ) return;\r
+                       type = X.Dom.Event.Rename[ type ] || type;\r
                        //if( type === 'load' && this._tag && X.Dom.Event._LOAD_FIX_TAGS[ this._tag ] ){\r
                        //      type = 'readystatechange';\r
                        //};\r
@@ -335,7 +339,7 @@ X.Dom.Node.prototype._addEvent =
                (function( type ){\r
                        var raw = this._rawNode || ( this._ie4getRawNode && this._ie4getRawNode() );\r
                        if( !raw ) return;\r
-                       raw[ 'on' + type ] = this._handleEvent = this._handleEvent || X.Callback.create( this );\r
+                       raw[ 'on' + ( X.Dom.Event.Rename[ type ] || type ) ] = this._handleEvent = this._handleEvent || X.Callback.create( this );\r
                });\r
 \r
 \r
@@ -360,6 +364,7 @@ X.Dom.Node.prototype._removeEvent =
                (function( type ){\r
                        var raw = this._rawNode;\r
                        if( !raw ) return;\r
+                       type = X.Dom.Event.Rename[ type ] || type;\r
                        \r
                        if( raw.addEventListener ){ // Image\r
                                raw.removeEventListener( type, this._handleEvent, false );\r
@@ -381,6 +386,7 @@ X.Dom.Node.prototype._removeEvent =
                (function( type ){\r
                        var raw = this._rawNode;\r
                        if( !raw ) return;\r
+                       type = X.Dom.Event.Rename[ type ] || type;\r
                        //if( type === 'load' && this._tag && X.Dom.Event._LOAD_FIX_TAGS[ this._tag ] ){\r
                        //      type = 'readystatechange';\r
                        //};\r
@@ -398,6 +404,7 @@ X.Dom.Node.prototype._removeEvent =
                (function( type ){\r
                        var raw = this._rawNode || ( this._ie4getRawNode && this._ie4getRawNode() );\r
                        if( !raw ) return;\r
+                       type = X.Dom.Event.Rename[ type ] || type;\r
                        raw[ 'on' + type ] = X.emptyFunction;\r
                        raw[ 'on' + type ] = '';\r
                        if( !this._listeners ){\r
index 34852d5..198598f 100644 (file)
@@ -122,11 +122,11 @@ _GRNERAL
                        p, name, sp;
                if( !obj ) return ''; // Opera7.5 未満?
                for( p in obj ){
-                       name = uncamelize( p );
+                       name = uncamelize( VENDER_PREFIX[ p ] || p );
                        if( FIX_PROP[ name ] ){
-                               sp = 1;
+                               sp = true;
                        } else {
-                               css[ ++n ] = [ VENDER_PREFIX[ name ] || name, obj[ p ] ].join( ':' );
+                               css[ ++n ] = [ name, obj[ p ] ].join( ':' );
                        };
                };
                sp && ( css[ ++n ] = 'filter:' + SPECIAL_FIX( obj ) );