OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.6.215, bug fixes X.Net.Image & X.HTMLAudio.
[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
3719b43
..
77bb067
100644
(file)
--- a/
0.6.x/js/02_dom/06_XNodeCSS.js
+++ b/
0.6.x/js/02_dom/06_XNodeCSS.js
@@
-277,9
+277,10
@@
function X_Node_CSS_objToCssText( that, skipFilter ){
};
if( filterFix ){
};
if( filterFix ){
- v = X_Node_CSS_objToIEFilterText( that, filterFix /* , css */ );
+ v = X_Node_CSS_objToIEFilterText( that, filterFix, css );
+ n = css.length; /* css が変更されている場合あり */
if( v ){
if( v ){
- css[ ++n
/* css.length */
] = 'filter:' + v;
+ css[ ++n ] = 'filter:' + v;
};
skipFilter = skipFilter && v;
} else {
};
skipFilter = skipFilter && v;
} else {
@@
-289,6
+290,7
@@
function X_Node_CSS_objToCssText( that, skipFilter ){
if( 0 <= n ){
// cssText には完全なものを控えるが、戻すのは filter を抜いたもの
that[ '_cssText' ] = css.join( ';' );
if( 0 <= n ){
// cssText には完全なものを控えるが、戻すのは filter を抜いたもの
that[ '_cssText' ] = css.join( ';' );
+ //console.log( that[ '_cssText' ] );
if( skipFilter ){
--css.length;
return css.join( ';' );
if( skipFilter ){
--css.length;
return css.join( ';' );
@@
-334,9
+336,10
@@
function X_Node_CSS_objToIEFilterText( that, opt_css, opt_cssList ){
filters[ ++n ] = v;
break;
case 2 : //'opacity' :
filters[ ++n ] = v;
break;
case 2 : //'opacity' :
- //if( v === 0 ){
- // opt_cssList && ( opt_cssList[ opt_cssList.length ] = 'visibility:hidden' );
- //} else
+ if( v === 0 ){
+ console.log( '@opacity:0 ' + !!opt_cssList );
+ opt_cssList && ( opt_cssList[ opt_cssList.length ] = 'visibility:hidden' );
+ } else
if( v < 1 ) filters[ ++n ] = 'alpha(opacity=' + ( v * 100 | 0 ) +')';
break;
case 3 : //'boxShadow' :
if( v < 1 ) filters[ ++n ] = 'alpha(opacity=' + ( v * 100 | 0 ) +')';
break;
case 3 : //'boxShadow' :
@@
-422,7
+425,7
@@
function X_Node_CSS_objToIEFilterText( that, opt_css, opt_cssList ){
break;
};
};
break;
};
};
- return filters.join( ' ' );
+ return filters.join( ' ' );
//n !== -1 ? filters.join( ' ' ) : '';
};
};