From: itozyun <itozyun@user.sourceforge.jp>
Date: Sun, 31 Aug 2014 09:37:03 +0000 (+0900)
Subject: Version 0.6.72, fix vender-prefix@X.DomStyle & X.Dom.Event.
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=ce7715d642b5d1dc046f8b489c1faa559e4d8393;p=pettanr%2FclientJs.git

Version 0.6.72, fix vender-prefix@X.DomStyle & X.Dom.Event.
---

diff --git a/0.6.x/js/01_dom/12_XDomEvent.js b/0.6.x/js/01_dom/12_XDomEvent.js
index f479338..d0f93ac 100644
--- a/0.6.x/js/01_dom/12_XDomEvent.js
+++ b/0.6.x/js/01_dom/12_XDomEvent.js
@@ -56,7 +56,7 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
 		} else
 		if( e.wheelDelta !== undefined ){
 			this.deltaX = 0;
-			this.deltaY = e.wheelDelta / 120;
+			this.deltaY = -e.wheelDelta / 120;
 		} else
 		if( e.detail !== undefined ){
 			this.deltaX = 0;
@@ -107,7 +107,7 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
 		var btn;
 		
 		//this._event        = e;
-		this.type          = e.type;
+		this.type          = X.Dom.Event.RenameTo[ e.type ] || e.type;
 		this.target        = Node._getXNode( e.srcElement ); // xnode
 		if( this.target && this.target._xnodeType === 3 ) this.target = this.target.parent; // ie4 の fake Textnode がヒットしていないか？
 		this.currentTarget = xnode; // xnode
@@ -163,7 +163,9 @@ if( !X.UA.IE || 9 <= X.UA.IE ){
 		};
 		this.button      = this.which - 1;
 		this.deltaX      = 0;
-		this.deltaY      = e.wheelDelta / 12;
+		this.deltaY      = e.wheelDelta / -12;
+		
+		if( this.type === 'wheel' ) console.log( e.wheelDelta );
 	};
 };
 
@@ -307,6 +309,7 @@ X.Dom.Node.prototype._addEvent =
 			var raw = this._rawNode;
 			if( !raw ) return;
 			this._handleEvent = this._handleEvent || X.Callback.create( this );
+			type = X.Dom.Event.Rename[ type ] || type;
 			if( raw.addEventListener ){
 				raw.addEventListener( type, this._handleEvent, false );
 			} else {
@@ -322,6 +325,7 @@ X.Dom.Node.prototype._addEvent =
 		(function( type ){
 			var raw = this._rawNode;
 			if( !raw ) return;
+			type = X.Dom.Event.Rename[ type ] || type;
 			//if( type === 'load' && this._tag && X.Dom.Event._LOAD_FIX_TAGS[ this._tag ] ){
 			//	type = 'readystatechange';
 			//};
@@ -335,7 +339,7 @@ X.Dom.Node.prototype._addEvent =
 		(function( type ){
 			var raw = this._rawNode || ( this._ie4getRawNode && this._ie4getRawNode() );
 			if( !raw ) return;
-			raw[ 'on' + type ] = this._handleEvent = this._handleEvent || X.Callback.create( this );
+			raw[ 'on' + ( X.Dom.Event.Rename[ type ] || type ) ] = this._handleEvent = this._handleEvent || X.Callback.create( this );
 		});
 
 
@@ -360,6 +364,7 @@ X.Dom.Node.prototype._removeEvent =
 		(function( type ){
 			var raw = this._rawNode;
 			if( !raw ) return;
+			type = X.Dom.Event.Rename[ type ] || type;
 			
 			if( raw.addEventListener ){ // Image
 				raw.removeEventListener( type, this._handleEvent, false );
@@ -381,6 +386,7 @@ X.Dom.Node.prototype._removeEvent =
 		(function( type ){
 			var raw = this._rawNode;
 			if( !raw ) return;
+			type = X.Dom.Event.Rename[ type ] || type;
 			//if( type === 'load' && this._tag && X.Dom.Event._LOAD_FIX_TAGS[ this._tag ] ){
 			//	type = 'readystatechange';
 			//};
@@ -398,6 +404,7 @@ X.Dom.Node.prototype._removeEvent =
 		(function( type ){
 			var raw = this._rawNode || ( this._ie4getRawNode && this._ie4getRawNode() );
 			if( !raw ) return;
+			type = X.Dom.Event.Rename[ type ] || type;
 			raw[ 'on' + type ] = X.emptyFunction;
 			raw[ 'on' + type ] = '';
 			if( !this._listeners ){
diff --git a/0.6.x/js/01_dom/15_XDomStyle.js b/0.6.x/js/01_dom/15_XDomStyle.js
index 34852d5..198598f 100644
--- a/0.6.x/js/01_dom/15_XDomStyle.js
+++ b/0.6.x/js/01_dom/15_XDomStyle.js
@@ -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 ) );