X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F02_dom%2F06_XNodeCSS.js;h=28e337d716a901887828009e8f1adf9c0096df96;hb=a720658bd6302a1bd5efae47333b6df793370f3d;hp=9711a5ebec645fcadd67b009d0a1051ee98e833f;hpb=86c591d2888cf7b24365c1950646fb1f6190efd1;p=pettanr%2FclientJs.git
diff --git a/0.6.x/js/02_dom/06_XNodeCSS.js b/0.6.x/js/02_dom/06_XNodeCSS.js
index 9711a5e..28e337d 100644
--- 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 ){
@@ -278,7 +278,9 @@ function X_Node_CSS_objToCssText( that, skipFilter ){
if( filterFix ){
v = X_Node_CSS_objToIEFilterText( that, filterFix );
- if( v ) css[ ++n ] = 'filter:' + v;
+ if( v ){
+ css[ ++n ] = 'filter:' + v;
+ };
skipFilter = skipFilter && v;
} else {
skipFilter = false;
@@ -299,7 +301,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,
@@ -330,7 +332,7 @@ function X_Node_CSS_objToIEFilterText( that, opt_css ){
filters[ ++n ] = v;
break;
case 2 : //'opacity' :
- filters[ ++n ] = 'alpha(opacity=' + ( v * 100 | 0 ) +')';
+ if( v !== 1 ) filters[ ++n ] = 'alpha(opacity=' + ( v * 100 | 0 ) +')';
break;
case 3 : //'boxShadow' :
// TODO ã«ã³ãåºåãã®è¤æ°æå®
@@ -584,6 +586,7 @@ function X_Node_CSS_setStyle( css, flags, name, newValue ){
return flags;
case 'opacity' :
+ flags |= X_NodeFlags_IE8_OPACITY_FIX;
// ãã§ã« visibility:hidden 㧠invisible
if( flags & X_NodeFlags_STYLE_IS_INVISIBLE && css[ 'visibility' ] === 'hidden' ) return flags;
newValue == 0 ? // 0 or "0"
@@ -639,7 +642,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;
};
@@ -789,11 +792,14 @@ var X_Node_CSS_Support = {},
* @namespace X.CSS
*/
X[ 'CSS' ] = {
-
+ /**
+ * @alias X.CSS.VENDER_PREFIX
+ */
'VENDER_PREFIX' : X_Node_CSS_VENDER_PREFIX,
- // iscroll ã§ä½¿ç¨
- 'uncamelize' : X_Node_CSS_uncamelize,
-
+
+ /**
+ * @alias X.CSS.Support
+ */
'Support' : X_Node_CSS_Support
};
@@ -825,7 +831,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;
@@ -837,41 +843,62 @@ X[ 'CSS' ] = {
};
testStyle.cssText = 'background:rgba(0,0,0,0.5);border-color:transparent';
+/**
+ * è²æå®ã« rgba() ã使ç¨ã§ããã?
+ * @alias X.CSS.Support.rgba
+ * @type {boolean}
+ */
X_Node_CSS_Support[ 'rgba' ] = !!testStyle[ 'background' ];
+
+/**
+ * è²æå®ã« transparent ã使ç¨ã§ããã?
+ * @alias X.CSS.Support.transparent
+ * @type {boolean}
+ */
X_Node_CSS_Support[ 'transparent' ] = !!testStyle[ 'borderColor' ];
// TODO border ã«ããä¸è§å½¢ã®å¯å¦
// 2:å®å
¨ã 1:ééã«é対å¿(IE7-) 0:borderã®æç»ãéæ¨æºã§ä¸è§å½¢ãä½ããªã
-
- /*
- * chrome 1+, ff3.5(1.9.1), ie9+, opera10.5+, Safari3+(522)
- */
+
if( prop = X_Node_CSS_VENDER_PREFIX[ 'boxShadow' ] ){
testStyle.cssText = X_Node_CSS_uncamelize( prop ) + ':0 0';
+
+ /**
+ * boxShadow ã使ç¨ã§ããã?
+ * chrome 1+, ff3.5(1.9.1), ie9+, opera10.5+, Safari3+(522)
+ * @alias X.CSS.Support.boxShadow
+ * @type {boolean}
+ */
X_Node_CSS_Support[ 'boxShadow' ] = !!testStyle[ prop ];
- /*
+ testStyle.cssText = X_Node_CSS_uncamelize( prop ) + ':0 0, 0 0';
+
+ /**
+ * boxShadow ã®è¤æ°æå®ã使ç¨ã§ããã?
* chrome 4+, ff3.5(1.9.1), ie9+, opera10.5+, Safari5+(533)
+ * @alias X.CSS.Support.boxShadowMulti
+ * @type {boolean}
*/
- testStyle.cssText = X_Node_CSS_uncamelize( prop ) + ':0 0, 0 0';
X_Node_CSS_Support[ 'boxShadowMulti' ] = !!testStyle[ prop ];
- /*
- * https://developer.mozilla.org/ja/docs/Web/CSS/box-shadow
- * ãã®å¤ãç¨ããå ´åã«ã¯ãspread-radius ãçç¥åºæ¥ã¾ãããbox-shadow ãå¹ããªãã±ã¼ã¹ã«ééããæã¯ãã®äºãæãåºãã¦ä¸ããã
- * chrome 4+, ff3.5(1.9.1), ie9+, opera10.5+, Safari5+(533)
+ testStyle.cssText = X_Node_CSS_uncamelize( prop ) + ':0 0 inset';
+
+ /**
+ * https://developer.mozilla.org/ja/docs/Web/CSS/box-shadow
+ * ãã®å¤ãç¨ããå ´åã«ã¯ãspread-radius ãçç¥åºæ¥ã¾ãããbox-shadow ãå¹ããªãã±ã¼ã¹ã«ééããæã¯ãã®äºãæãåºãã¦ä¸ããã
+ * chrome 4+, ff3.5(1.9.1), ie9+, opera10.5+, Safari5+(533)
*
- * http://unformedbuilding.com/articles/considerations-when-using-the-box-shadow/
- * box-shadow:inset 㨠border-radius ãæå®ãã¦ããã¨ãã® Google Chrome ã®è¡¨ç¤º
- * ãã®ãã°ã¯ Windows 㨠Linux ã§çºçããããã§ãã
- * Windows ç Chrome 10.0.648.127 ã§ä¿®æ£ããã¦ããã®ã確èªãã¾ããã
+ * http://unformedbuilding.com/articles/considerations-when-using-the-box-shadow/
+ * box-shadow:inset 㨠border-radius ãæå®ãã¦ããã¨ãã® Google Chrome ã®è¡¨ç¤º
+ * ãã®ãã°ã¯ Windows 㨠Linux ã§çºçããããã§ãã
+ * Windows ç Chrome 10.0.648.127 ã§ä¿®æ£ããã¦ããã®ã確èªãã¾ããã
+ * @alias X.CSS.Support.boxShadowInset
+ * @type {boolean}
*/
- testStyle.cssText = X_Node_CSS_uncamelize( prop ) + ':0 0 inset';
X_Node_CSS_Support[ 'boxShadowInset' ] = testStyle[ prop ] && testStyle[ prop ].indexOf( 'inset' ) !== -1;
};
-
testStyle.cssText = temp;
})();