Version 0.6.107, cleanup X.NodeCSS, fix X.Node.Event for touch, add unescape for...

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

diff --git a/0.6.x/js/02_dom/02_XNode.js b/0.6.x/js/02_dom/02_XNode.js
index 22c8f03..525eb81 100644 (file)
--- a/0.6.x/js/02_dom/02_XNode.js
+++ b/0.6.x/js/02_dom/02_XNode.js
@@ -272,7 +272,7 @@ function X_Node_getXNode( v ){
                        };\r
                        return v.UID && X_Node_CHASHE[ v.UID ];\r
                case X_Node_TYPE.WINDOW :\r
-                       return X.ViewPort;\r
+                       return X_ViewPort;\r
                case X_Node_TYPE.DOCUMENT :\r
                        return X_ViewPort_document;\r
                case X_Node_TYPE.RAW_TEXT :\r
@@ -833,7 +833,7 @@ function X_Node_html( html ){
                return this._text;\r
        };\r
        \r
-       if( this._dirty & X_Node_Dirty.CSS && !( this._cssText = X_Node_CSS_objToCssText( this._css ) ) ){\r
+       if( this._dirty & X_Node_Dirty.CSS && !( this._cssText = X_Node_CSS_objToCssText( this ) ) ){\r
                delete this._cssText;\r
        };\r
        html = !X_Node_outerXNode ? [] : [\r
@@ -977,7 +977,7 @@ function X_Node_startUpdate(){
 \r
 \r
        // このイベントでサイズを取ると無限ループに\r
-       // X_ViewPort._listeners && X_ViewPort._listeners[ X.Event.BEFORE_UPDATE ] && X_ViewPort.dispatch( X.Dom.Event.BEFORE_UPDATE );\r
+       X_System._listeners && X_System._listeners[ X.Event.BEFORE_UPDATE ] && X_System.dispatch( X.Event.BEFORE_UPDATE );\r
 \r
        removal = X_Node_reserveRemoval;\r
        \r
@@ -1001,6 +1001,8 @@ function X_Node_startUpdate(){
        \r
        //console.log( 'end of _startUpdate().' );\r
        \r
+       X_System._listeners && X_System._listeners[ X.Event.UPDATED ] && X_System.dispatch( X.Event.UPDATED );\r
+       \r
        X_ViewPort._listeners && X_ViewPort._listeners[ X.Event.AFTER_UPDATE ] && X_ViewPort.asyncDispatch( X.Event.AFTER_UPDATE );\r
        //this._rawObject.style.visibility = tmp;\r
 };\r
@@ -1125,7 +1127,7 @@ var X_Node__updateRawNode =
                        // style\r
                        // TODO display:none の場合、更新をスキップ\r
                        if( that._dirty & X_Node_Dirty.CSS ){\r
-                               if( that._cssText !== null || ( that._cssText = X_Node_CSS_objToCssText( that._css ) ) ){\r
+                               if( that._cssText !== null || ( that._cssText = X_Node_CSS_objToCssText( that ) ) ){\r
                                        X_UA.Opera78 || X_UA.NN6 ?\r
                                                elm.setAttribute( 'style', that._cssText ) : // opera8用\r
                                                ( elm.style.cssText = that._cssText );\r
@@ -1137,7 +1139,7 @@ var X_Node__updateRawNode =
                        };\r
                        \r
                        if( that._dirty & X_Node_Dirty.IE_FILTER ){\r
-                               elm.style.filter = X_Node_CSS_SPECIAL_FIX( that._css );\r
+                               elm.style.filter = X_Node_CSS_objToIEFilterText( that );;\r
                        };\r
                        \r
                        // attr\r
@@ -1188,7 +1190,7 @@ var X_Node__updateRawNode =
                        };\r
                        // style\r
                        if( that._dirty & X_Node_Dirty.CSS ){\r
-                               if( that._cssText !== null || ( that._cssText = X_Node_CSS_objToCssText( that._css ) ) ){\r
+                               if( that._cssText !== null || ( that._cssText = X_Node_CSS_objToCssText( that ) ) ){\r
                                        elm.style.cssText = that._cssText;\r
                                } else {\r
                                        elm.style.cssText = '';\r
@@ -1198,7 +1200,7 @@ var X_Node__updateRawNode =
                        };\r
                        \r
                        if( that._dirty & X_Node_Dirty.IE_FILTER ){\r
-                               that._rawObject.style.filter = X_Node_CSS_SPECIAL_FIX( that._css );\r
+                               that._rawObject.style.filter = X_Node_CSS_objToIEFilterText( that );;\r
                        };\r
                        \r
                        // attr\r
@@ -1247,7 +1249,7 @@ var X_Node__actualCreate =
                };\r
                \r
                if( !elm ){\r
-                       if( that._dirty & X_Node_Dirty.CSS && !( that._cssText = X_Node_CSS_objToCssText( that._css ) ) ){\r
+                       if( that._dirty & X_Node_Dirty.CSS && !( that._cssText = X_Node_CSS_objToCssText( that ) ) ){\r
                                delete that._cssText;\r
                        };\r
                        that._isNew = true;\r
@@ -1285,7 +1287,7 @@ var X_Node__actualCreate =
                } else {\r
                        if( that._rawObject && !isChild ) X_Node__actualRemove( that, true );\r
                        \r
-                       if( that._dirty & X_Node_Dirty.CSS && !( that._cssText = X_Node_CSS_objToCssText( that._css ) ) ){\r
+                       if( that._dirty & X_Node_Dirty.CSS && !( that._cssText = X_Node_CSS_objToCssText( that ) ) ){\r
                                delete that._cssText;\r
                        };\r
                        \r
@@ -1341,7 +1343,7 @@ var X_Node__afterActualCreate =
                        };\r
                        if( X_Node_strictElmCreation ){\r
                                if( that._dirty & X_Node_Dirty.IE_FILTER ){\r
-                                       elm.style.filter = X_Node_CSS_SPECIAL_FIX( that._css );\r
+                                       elm.style.filter = X_Node_CSS_objToIEFilterText( that );;\r
                                };\r
                                delete that._dirty;\r
                        } else {\r
@@ -1376,7 +1378,7 @@ var X_Node__afterActualCreate =
                };\r
                // textarea への value の適用はここで\r
                if( that._dirty & X_Node_Dirty.IE_FILTER ){\r
-                       X_Node__ie4getRawNode( that ).style.filter = X_Node_CSS_SPECIAL_FIX( that._css );\r
+                       X_Node__ie4getRawNode( that ).style.filter = X_Node_CSS_objToIEFilterText( that );;\r
                };\r
                delete that._dirty;\r
                X_EventDispatcher_toggleAllEvents( that, true );// イベントの復帰\r