Version 0.6.193, bug fixes X.Node.Anime.

[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 06_XNodeCSS.js

diff --git a/0.6.x/js/02_dom/06_XNodeCSS.js b/0.6.x/js/02_dom/06_XNodeCSS.js
index 9711a5e..f9ddadd 100644 (file)
--- a/0.6.x/js/02_dom/06_XNodeCSS.js
+++ b/0.6.x/js/02_dom/06_XNodeCSS.js
@@ -190,7 +190,7 @@ function X_Node_CSS_parseColor( x ){
        var rgb, r, g, b;
        
        if( X_Type_isNumber( x ) ){
-               return ( 0x0 <= x && x <= 0xFFFFFF ) ? x : undefined;
+               return ( 0x0 <= x && x <= 0xFFFFFF ) ? x : NaN;
        } else
        if( !X_Type_isString( x ) ) return;
        
@@ -239,9 +239,9 @@ function X_Node_CSS_parseColor( x ){
                        b *= 2.55;
                };
        } else {
-               return undefined;
+               return NaN;
        };
-       return isFinite( r + b + g ) ? ( r << 16 ) + ( g << 8 ) + b : undefined;
+       return X_Type_isFinite( r + b + g ) ? ( r << 16 ) + ( g << 8 ) + b : NaN;
 };
 
 function X_Node_CSS_objToCssText( that, skipFilter ){
@@ -299,7 +299,7 @@ function X_Node_CSS_objToCssText( that, skipFilter ){
 
 var
 X_Node_CSS_FILTER_FIX_PROPS =
-       X_UA[ 'ActiveX' ] && X_UA[ 'IE' ] < 9 && !X_UA[ 'MacIE' ] ?
+       X_UA[ 'ActiveX' ] && X_UA[ 'IE' ] < 9 ?
                {
                        'opacity'    : 2,
                        'boxShadow'  : 3,
@@ -639,7 +639,7 @@ function X_Node_CSS_setStyle( css, flags, name, newValue ){
 function X_Node_cssText( v ){
        var obj, i, l, attr, name;
        
-       if( v === this[ '_cssText' ] && ( this[ '_flags' ] & X_NodeFlags_OLD_CSSTEXT ) === 0 ){
+       if( v === this[ '_cssText' ] && ( ( this[ '_flags' ] & X_NodeFlags_OLD_CSSTEXT ) === 0 ) ){
                return this;
        };      
        
@@ -825,7 +825,7 @@ X[ 'CSS' ] = {
                        for( j = vendors.length; j; ){
                                v = vendors[ --j ];
                                if( testStyle[ v + prop ] !== undefined ){
-                                       if( v === 'ms' ) v = 'Ms';// for ie9
+                                       if( v === 'ms' && !( 10 <= X_UA[ 'IEHost' ] ) ) v = 'Ms';// for ie9, 但し ie11 のieには不要
                                        if( v === 'o' ) v = 'O';//for opera12
                                        X_Node_CSS_VENDER_PREFIX[ search ] = v + prop;
                                        break;