Version 0.6.23, remove AbstractBox(AbstractDisplayContainer), working ie-filter-fix.

[pettanr/clientJs.git] / 0.6.x / js / dom / 15_XDomStyle.js

diff --git a/0.6.x/js/dom/15_XDomStyle.js b/0.6.x/js/dom/15_XDomStyle.js
index 5dd18f5..9901d91 100644 (file)
--- a/0.6.x/js/dom/15_XDomStyle.js
+++ b/0.6.x/js/dom/15_XDomStyle.js
@@ -132,19 +132,30 @@ _GRNERAL
                        VENDER_PREFIX = me.VENDER_PREFIX,
                        FIX_PROP      = me.SPECIAL_FIX_PROP,
                        SPECIAL_FIX   = me.SPECIAL_FIX,
+                       n             = -1,
                        p, name, sp;
                for( p in obj ){
                        name = uncamelize( p );
                        if( FIX_PROP[ name ] ){
                                sp = 1;
                        } else {
-                               css[ css.length ] = [ VENDER_PREFIX[ name ] || name, obj[ p ] ].join( ':' );
+                               css[ ++n ] = [ VENDER_PREFIX[ name ] || name, obj[ p ] ].join( ':' );
                        };
                };
-               sp && ( css[ css.length ] = SPECIAL_FIX( obj ) );
+               sp && ( css[ ++n ] = SPECIAL_FIX( obj ) );
                return css.join( ';' );
        },
        
+       IE_FILTER_FIX :
+               X.UA.IE && X.UA.IE < 8 ?
+                       {
+                               opacity : 1,
+                               textShadow : 1
+                       } :
+               X.UA.IE === 9 ?
+                       {} :
+                       {},
+       
        _UNIT_RATIO      : null,
        _FONT_SIZE_RATIO : null,
 
@@ -843,35 +854,40 @@ X.Dom.Style.SPECIAL_FIX =
        X.UA.IE && X.UA.IE < 9 ?
                (function( obj ){
                        var test    = X.Dom.Style.SPECIAL_FIX_PROP,
-                               filters = [], p, id, v;
+                               filters = [],
+                               n       = -1,
+                               p, id, v, dir;
                        for( p in obj ){
                                if( !( id = test[ p ] ) ) continue;
                                v = obj[ p ];
                                switch( id ){
                                        case 1 : //'filter' :
-                                               filters[ filters.length ] = v;
+                                               filters[ ++n ] = v;
                                                break;
                                        case 2 : //'opacity' :
-                                               filters[ filters.length ] = 'aplha(opacity=' + v +')';
+                                               filters[ ++n ] = 'alpha(opacity=' + v * 100 +')';
                                                break;
                                        case 3 : //'boxShadow' :
                                                // box-shadow: 10px 10px 10px 10px rgba(0,0,0,0.4) inset;
                                                //　スペース区切りで、水平方向の距離 垂直方向の距離 ぼかし距離 広がり距離 影の色 insetキーワードを指定する。 ぼかし距離 広がり距離 影の色 insetキーワードは省略可
                                                // shadow(color=#cccccc, strength=10, direction=135);
-                                               parseValue( 'boxShadow', v, 'px' );
-                                               dir = Math.atan2( ary[1], ary[0] ) * 180 / Math.PI + 90;
+                                               v = X.Dom.Style._getProperty( this, css, 'px', 'boxShadow' );
+                                               dir = Math.atan2( v[ 1 ], v[ 0 ] ) * 180 / Math.PI + 90;
                                                dir += dir < 0 ? 360 : 0;
+                                               filters[ ++n ] = 'shadow(color=' + v[ 4 ] + ',strength=' + v[ 3 ] + ',direction=' + dir + ')';
                                                break;
                                        case 4 : //'textShadow' :
                                                //text-shadow: 5px 5px 2px blue; 水平方向の距離 垂直方向の距離 影のぼかし半径 影の色 none
                                                //glow(Color=yellow,Strength=10);
                                                //どうやらCSSのbackgroundプロパティと同時に使えないようです。 
+                                               
+                                               
                                                break;
                                        case 5 : //'backgroundImage' :
                                                //
                                };
                        };
-                       if( filters ) return filters.join( ' ' );
+                       return filters.join( ' ' );
                }) :
        // IE9 textShadow に filter を使用
        X.UA.IE && 9 <= X.UA.IE && X.UA.IE < 10 ?
@@ -936,13 +952,17 @@ X.Dom.Node.prototype.css = function( nameOrObj /* orUnitID, valuOrUnitOrName */
        var XDomStyle = X.Dom.Style,
                args = arguments,
                css  = this._css,
-               p, valOrUnit, name, v, camelize, unit;
+               p, name, v, camelize, unit, ieFix;
        if( this._xnodeType !== 1 ) return this;
 // setter:object
        if( X.Type.isObject( nameOrObj ) ){
                if( !css ) css = this._css = {};
                camelize = XDomStyle.camelize;
+               ieFix    = X.Dom.Style.IE_FILTER_FIX;
                for( p in nameOrObj ){
+                       if( ieFix[ p ] ){
+                               this._dirty |= X.Dom.Dirty.IE_FILTER;
+                       };
                        css[ camelize( p ) ] = nameOrObj[ p ];
                };
                this._dirty |= X.Dom.Dirty.CSS;
@@ -957,6 +977,9 @@ X.Dom.Node.prototype.css = function( nameOrObj /* orUnitID, valuOrUnitOrName */
                        name = XDomStyle.camelize( nameOrObj );
                        v    = args[ 1 ];
                        if( css[ name ] === v ) return this;
+                       if( X.Dom.Style.IE_FILTER_FIX[ name ] ){
+                               this._dirty |= X.Dom.Dirty.IE_FILTER;
+                       };                      
                        if( !v && v !== 0 ){
                                delete css[ name ];
                        } else {
@@ -1033,7 +1056,7 @@ X.Dom.Node.prototype._getCharSize =
                        // appendChild
                        // removeChild
                }) :
-       document.removeChild ?
+       document.getElementById ?
                (function(){
                        var elm = document.createElement( 'span' ),
                                v;
@@ -1092,7 +1115,7 @@ X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT, function(){
                };
                return ret;
        })();
-               
+       
        X.Dom.Style.SPECIAL_FIX_PROP =
                // ~IE8
                X.UA.IE && X.UA.IE < 9 ?
@@ -1140,4 +1163,5 @@ X.Dom.listenOnce( X.Dom.Event.DOM_INIT, function(){
        };
        
        xnode.empty().cssText( '' );
-} );
\ No newline at end of file
+} );
+