var \r
- \r
+ /** @enum {number}\r
+ * @const */\r
X_Node_State = {\r
DESTROYED : 0x0,\r
EXIST : 0x1,\r
IE4_FIXED : X_UA[ 'IE4' ] ? 2 << 24 : 0,\r
\r
IE5_DISPLAY_NONE_FIX : X_UA[ 'IE5' ] && X_UA[ 'ActiveX' ] ? 2 << 24 : 0\r
- },\r
+ };\r
\r
- X_Node_BITMASK_RESET_STYLE = ( ( 2 << 29 ) - 1 + ( 2 << 29 ) ) ^ (\r
+var X_Node_BITMASK_RESET_STYLE = ( ( 2 << 29 ) - 1 + ( 2 << 29 ) ) ^ (\r
X_Node_State.STYLE_IS_DISPLAY_NONE |\r
X_Node_State.STYLE_IS_INVISIBLE |\r
X_Node_State.STYLE_IS_POS_ABSOLUTE |\r
\r
X_Node_BitMask_IE4_IS_MIX = X_Node_State.IE4_HAS_TEXTNODE | X_Node_State.IE4_HAS_ELEMENT,\r
\r
+ /** @enum {number} */\r
X_Node_TYPE = {\r
XNODE : 1,\r
RAW_HTML : 2,\r
* \r
* @alias X.Node\r
* @class Node HTMLElement、TextNode をラップし jQuery 風な API で操作できます。\r
- * @constructor \r
* @constructs Node\r
* @extends {EventDispatcher}\r
*/\r
-var Node = X.Node = X.EventDispatcher.inherits(\r
+var Node = X[ 'Node' ] = X_EventDispatcher[ 'inherits' ](\r
'X.Node',\r
X.Class.POOL_OBJECT, // X.Class.FINAL\r
+ \r
{\r
- _uid : 0,\r
- _flags : X_Node_State.DESTROYED,\r
+ /**\r
+ * 要素に振られるユニークID\r
+ * @type {number}\r
+ * @private\r
+ * @alias Node.prototype._uid\r
+ */\r
+ '_uid' : 0,\r
+ \r
+ /**\r
+ * Node の状態を表すフラグ。\r
+ * @type {number}\r
+ * @private\r
+ * @alias Node.prototype._flags\r
+ */\r
+ '_flags' : X_Node_State.DESTROYED,\r
\r
// _rawObject : null,\r
- _rect : null, // \r
- _fontSize : 0,\r
+ '_rect' : null, //\r
+ \r
+ /**\r
+ * 最後に計測したフォントサイズを保持している。ツリーが変更されると削除される。\r
+ * @type {number}\r
+ * @private\r
+ * @alias Node.prototype._fontSize\r
+ */\r
+ '_fontSize' : 0,\r
+ \r
+ /**\r
+ * NodeList と動作を一致させるためのプロパティ。常に 1。\r
+ * @type {number}\r
+ * @private\r
+ * @alias Node.prototype.length\r
+ */\r
+ length : 1,\r
+ \r
+ /**\r
+ * 親 Node。\r
+ * @type {Node}\r
+ * @private\r
+ * @alias Node.prototype.parent\r
+ */\r
+ parent : null, // remove された枝も親子構造は維持している。\r
+ \r
+ /**\r
+ * 子 Node リスト\r
+ * @type {Array}\r
+ * @private\r
+ * @alias Node.prototype._xnodes\r
+ */\r
+ '_xnodes' : null,\r
+ \r
+ /**\r
+ * GPU レイヤーに転送されている場合、その一番親となっている Node。未実装。\r
+ * @type {Node}\r
+ * @private\r
+ * @alias Node.prototype._gpuParent\r
+ */\r
+ '_gpuParent' : null,\r
+\r
+ /**\r
+ * タグ名。テキストノードの場合は空文字列。\r
+ * @type {string}\r
+ * @private\r
+ * @alias Node.prototype._tag\r
+ */\r
+ '_tag' : '',\r
\r
- length : 1,\r
- parent : null, // remove された枝も親子構造は維持している。\r
- _xnodes : null, // Array.<Node>\r
- _gpuParent : null, // TODO\r
-\r
- _tag : '',\r
- _text : '',\r
- _id : '', //\r
- _className : '', //\r
-\r
- _attrs : null, // see X_Node_Attr\r
- _newAttrs : null,\r
- _attrText : '',\r
+ /**\r
+ * テキストコンテンツ。テキストノードで使用。\r
+ * @type {string}\r
+ * @private\r
+ * @alias Node.prototype._text\r
+ */\r
+ '_text' : '',\r
\r
- _css : null, // see X_Node_CSS\r
- _cssText : '',\r
+ /**\r
+ * id\r
+ * @type {string}\r
+ * @private\r
+ * @alias Node.prototype._id\r
+ */\r
+ '_id' : '',\r
\r
- _anime : null, // Hash see X_Node_Anime\r
+ /**\r
+ * クラス名。複数のクラスが設定されている場合、スペース区切り。\r
+ * @type {string}\r
+ * @private\r
+ * @alias Node.prototype._className\r
+ */\r
+ '_className' : '', //\r
+\r
+ /**\r
+ * 属性。\r
+ * @type {object}\r
+ * @private\r
+ * @alias Node.prototype._attrs\r
+ */\r
+ '_attrs' : null, // see X_Node_Attr\r
+ \r
+ /**\r
+ * まだコミットされていない属性。\r
+ * @type {object}\r
+ * @private\r
+ * @alias Node.prototype._newAttrs\r
+ */\r
+ '_newAttrs' : null,\r
+ \r
+ /**\r
+ * 属性を文字列にしたもの。 color="red" size="8"\r
+ * @type {object}\r
+ * @private\r
+ * @alias Node.prototype._attrText\r
+ */\r
+ '_attrText' : '',\r
+ \r
+ /**\r
+ * スタイル。\r
+ * @type {object}\r
+ * @private\r
+ * @alias Node.prototype._css\r
+ */\r
+ '_css' : null,\r
+ \r
+ /**\r
+ * cssText\r
+ * @type {string}\r
+ * @private\r
+ * @alias Node.prototype._cssText\r
+ */\r
+ '_cssText' : '',\r
+ \r
+ /**\r
+ * アニメーション用オブジェクト。\r
+ * @type {object}\r
+ * @private\r
+ * @alias Node.prototype._anime\r
+ */\r
+ '_anime' : null,\r
\r
/*\r
* TODO Node の継承ができない！\r
*/\r
- Constructor : function( v ){\r
+ 'Constructor' : function( v ){\r
var uid = X_Node_CHASHE.length,\r
css, xnodes, xnode, parent;\r
\r
if( X_Node_newByTag ){\r
X_Node_newByTag = false;\r
- this._tag = v.toUpperCase();\r
+ this[ '_tag' ] = v.toUpperCase();\r
arguments[ 1 ] && this.attr( arguments[ 1 ] );\r
css = arguments[ 2 ];\r
css && this[ X_Type_isString( css ) ? 'cssText' : 'css' ]( css );\r
} else\r
if( X_Node_newByText ){\r
X_Node_newByText = false;\r
- this._text = v;\r
+ this[ '_text' ] = v;\r
} else {\r
if( 1 < arguments.length ) return new X_NodeList( arguments );\r
if( X_Type_isArray( v ) && v.length ) return new X_NodeList( v );\r
if( xnode = X_Node_getXNode( v ) ) return xnode;\r
// v.parentNode || v.parentElement : dom1 || dom0\r
this.parent = ( parent = v.parentNode || v.parentElement ) && parent.tagName /* ie7- */ && X_Node_getXNode( parent );\r
- this._rawObject = v;\r
- this._tag = v.tagName.toUpperCase();\r
- this._id = v.id;\r
- this._className = v.className;\r
+ this[ '_rawObject' ] = v;\r
+ this[ '_tag' ] = v.tagName.toUpperCase();\r
+ this[ '_id' ] = v.id;\r
+ this[ '_className' ] = v.className;\r
\r
- this.cssText( v.style.cssText );\r
- this._flags &= X_Node_BitMask_RESET_DIRTY; // X_Node_State.DIRTY_CSS を落とす\r
+ this[ 'cssText' ]( v.style.cssText );\r
+ this[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY; // X_Node_State.DIRTY_CSS を落とす\r
\r
// TODO attr の回収は不可能、、、?\r
if( X_UA_DOM.IE4 ){\r
v.setAttribute( 'UID', '' + uid );\r
} else {\r
- v.UID = uid;\r
+ v[ 'UID' ] = uid;\r
};\r
// childNodes...\r
break;\r
case X_Node_TYPE.RAW_TEXT :\r
if( xnode = X_Node_getXNode( v ) ) return xnode;\r
this.parent = X_Node_getXNode( v.parentNode );\r
- this._rawObject = v;\r
- this._text = v.data;\r
- v.UID = uid;\r
+ this[ '_rawObject' ] = v;\r
+ this[ '_text' ] = v.data;\r
+ v[ 'UID' ] = uid;\r
break;\r
\r
case X_Node_TYPE.HTML_STRING :\r
};\r
};\r
\r
- if( this.parent && ( this.parent._flags & X_Node_State.IN_TREE ) ){\r
- this._flags |= X_Node_State.IN_TREE;\r
+ if( this.parent && ( this.parent[ '_flags' ] & X_Node_State.IN_TREE ) ){\r
+ this[ '_flags' ] |= X_Node_State.IN_TREE;\r
};\r
- this._flags |= X_Node_State.EXIST;\r
- X_Node_CHASHE[ this._uid = uid ] = this;\r
+ this[ '_flags' ] |= X_Node_State.EXIST;\r
+ X_Node_CHASHE[ this[ '_uid' ] = uid ] = this;\r
},\r
\r
// attr\r
// find\r
// animate, stop\r
\r
- create : X_Node_create,\r
+ 'create' : X_Node_create,\r
\r
- createAt : X_Node_createAt,\r
+ 'createAt' : X_Node_createAt,\r
\r
- createText : X_Node_createText,\r
+ 'createText' : X_Node_createText,\r
\r
- createTextAt : X_Node_createTextAt,\r
+ 'createTextAt' : X_Node_createTextAt,\r
\r
- clone : X_Node_clone,\r
+ 'clone' : X_Node_clone,\r
\r
- append : X_Node_append,\r
+ 'append' : X_Node_append,\r
\r
- appendAt : X_Node_appendAt,\r
+ 'appendAt' : X_Node_appendAt,\r
\r
- appendTo : X_Node_appendTo,\r
+ 'appendTo' : X_Node_appendTo,\r
\r
- appendToRoot : X_Node_appendToRoot, // remove\r
+ 'prev' : X_Node_before,\r
\r
- before : X_Node_before, // remove\r
+ 'next' : X_Node_after,\r
\r
- prev : X_Node_before,\r
+ 'swap' : X_Node_swap,\r
\r
- after : X_Node_after, // remove\r
+ 'remove' : X_Node_remove,\r
\r
- next : X_Node_after,\r
- \r
- swap : X_Node_swap,\r
- \r
- remove : X_Node_remove,\r
- \r
- empty : X_Node_empty,\r
+ 'empty' : X_Node_empty,\r
\r
destroy : X_Node_destroy, // -> kill && kill event\r
\r
- contains : X_Node_contains,\r
+ 'contains' : X_Node_contains,\r
\r
- getChildAt : X_Node_getChildAt,\r
+ 'getChildAt' : X_Node_getChildAt,\r
\r
- numChildren : X_Node_length,\r
+ 'numChildren' : X_Node_length,\r
\r
- firstChild : X_Node_firstChild,\r
+ 'firstChild' : X_Node_firstChild,\r
\r
- lastChild : X_Node_lastChild,\r
+ 'lastChild' : X_Node_lastChild,\r
\r
- getOrder : X_Node_getOrder,\r
+ 'getOrder' : X_Node_getOrder,\r
\r
- className : X_Node_className,\r
- addClass : X_Node_addClass,\r
- removeClass : X_Node_removeClass,\r
- toggleClass : X_Node_toggleClass,\r
- hasClass : X_Node_hasClass,\r
+ 'className' : X_Node_className,\r
+ 'addClass' : X_Node_addClass,\r
+ 'removeClass' : X_Node_removeClass,\r
+ 'toggleClass' : X_Node_toggleClass,\r
+ 'hasClass' : X_Node_hasClass,\r
\r
- html : X_Node_html,\r
- text : X_Node_text,\r
- call : X_Node_call,\r
- each : X_Node_each\r
+ 'html' : X_Node_html,\r
+ 'text' : X_Node_text,\r
+ 'call' : X_Node_call,\r
+ 'each' : X_Node_each\r
\r
}\r
);\r
uid = v.getAttribute( 'UID' );\r
return uid && X_Node_CHASHE[ uid ];\r
};\r
- return v.UID && X_Node_CHASHE[ v.UID ];\r
+ return v[ 'UID' ] && X_Node_CHASHE[ v[ 'UID' ] ];\r
case X_Node_TYPE.WINDOW :\r
return X_ViewPort;\r
case X_Node_TYPE.DOCUMENT :\r
return X_ViewPort_document;\r
case X_Node_TYPE.RAW_TEXT :\r
- if( v.UID ) return X_Node_CHASHE[ v.UID ];\r
+ if( v[ 'UID' ] ) return X_Node_CHASHE[ v[ 'UID' ] ];\r
for( chashe = X_Node_CHASHE, i = chashe.length; i; ){\r
- if( ( xnode = X_Node_CHASHE[ --i ] ) && ( xnode._rawObject === v ) ) return xnode;\r
+ if( ( xnode = X_Node_CHASHE[ --i ] ) && ( xnode[ '_rawObject' ] === v ) ) return xnode;\r
};\r
};\r
};\r
\r
function X_Node_getRoot( xnode ){\r
return X_ViewPort_document;\r
- //return X_Node_body._rawObject.documentElement ? node : node.ownerDocument || node.document;\r
+ //return X_Node_body[ '_rawObject' ].documentElement ? node : node.ownerDocument || node.document;\r
};\r
// XMLかどうかを判別する\r
var X_Node_isXmlDocument =\r
X_UA_DOM.IE4 ?\r
- X.emptyFunction :\r
+ X_emptyFunction :\r
(function( root ){\r
if( X_Type_isBoolean( root.isXML ) ) return root.isXML;\r
- return root.isXML = root._rawObject.createElement( 'p' ).tagName !== root._rawObject.createElement( 'P' ).tagName;\r
+ return root.isXML = root[ '_rawObject' ].createElement( 'p' ).tagName !== root[ '_rawObject' ].createElement( 'P' ).tagName;\r
}),\r
X_Node_CHASHE = [],\r
X_Node_none = X_Node_CHASHE[ 0 ] = new Node(),\r
* remove :\r
* X_Node_reserveRemoval = [] に追加。commitUpdate で remove\r
* add :\r
- * X_Node_reserveRemoval にいたら消す, new_parent._xnodes に挿入\r
+ * X_Node_reserveRemoval にいたら消す, new_parent[ '_xnodes' ] に挿入\r
*/\r
X_Node_reserveRemoval = [];\r
\r
\r
var X_Node__ie4getRawNode = X_UA_DOM.IE4 && function ( that ){\r
- return that._rawObject ||\r
- ( that._rawObject = document.all[ 'ie4uid' + that._uid ] ) ||\r
- ( that._id && ( that._rawObject = document.all[ that._id ] ) );\r
+ return that[ '_rawObject' ] ||\r
+ ( that[ '_rawObject' ] = document.all[ 'ie4uid' + that[ '_uid' ] ] ) ||\r
+ ( that[ '_id' ] && ( that[ '_rawObject' ] = document.all[ that[ '_id' ] ] ) );\r
};\r
\r
\r
var i = xnodes.length, xnode;\r
for( ; i; ){\r
xnode = xnodes[ --i ];\r
- flag ? ( xnode._flags |= X_Node_State.IN_TREE | X_Node_State.DIRTY_POSITION ) : ( xnode._flags &= ~X_Node_State.IN_TREE & ~X_Node_State.IE5_DISPLAY_NONE_FIX );\r
- xnode._xnodes && X_Node_toggleInTreeFlag( xnode._xnodes, flag );\r
+ flag ? ( xnode[ '_flags' ] |= X_Node_State.IN_TREE | X_Node_State.DIRTY_POSITION ) : ( xnode[ '_flags' ] &= ~X_Node_State.IN_TREE & ~X_Node_State.IE5_DISPLAY_NONE_FIX );\r
+ xnode[ '_xnodes' ] && X_Node_toggleInTreeFlag( xnode[ '_xnodes' ], flag );\r
};\r
};\r
\r
if( flag ){\r
for( ; i; ){\r
xnode = xnodes[ --i ];\r
- if( !xnode._gpuParent ){\r
- xnode._flags |= X_Node_State.GPU_CHILD;\r
- xnode._gpuParent = gpuRoot;\r
- xnode._xnodes && X_Node_toggleInTreeFlag( gpuRoot, xnode._xnodes, flag ); \r
+ if( !xnode[ '_gpuParent' ] ){\r
+ xnode[ '_flags' ] |= X_Node_State.GPU_CHILD;\r
+ xnode[ '_gpuParent' ] = gpuRoot;\r
+ xnode[ '_xnodes' ] && X_Node_toggleInTreeFlag( gpuRoot, xnode[ '_xnodes' ], flag ); \r
};\r
};\r
} else {\r
for( ; i; ){\r
xnode = xnodes[ --i ];\r
- if( xnode._gpuParent === gpuRoot ){\r
- xnode._flags &= ~X_Node_State.GPU_CHILD;\r
- delete xnode._gpuParent;\r
- xnode._xnodes && X_Node_toggleInTreeFlag( gpuRoot, xnode._xnodes, flag );\r
+ if( xnode[ '_gpuParent' ] === gpuRoot ){\r
+ xnode[ '_flags' ] &= ~X_Node_State.GPU_CHILD;\r
+ delete xnode[ '_gpuParent' ];\r
+ xnode[ '_xnodes' ] && X_Node_toggleInTreeFlag( gpuRoot, xnode[ '_xnodes' ], flag );\r
};\r
};\r
};\r
};\r
\r
-/* --------------------------------------\r
- * Create\r
+/**\r
+ * タグ名等を指定して新規に子ノードを作成し、現在のノードに追加する。\r
+ * @alias Node.prototype.create\r
+ * @param {string} [tag] タグ名\r
+ * @param {object} [opt_attrs=] 属性\r
+ * @param {object|string} [opt_css=] css\r
+ * @return {Node} 新規作成されたノード\r
+ * @example var child = parent.create( 'div' );\r
*/\r
function X_Node_create( tag, opt_attrs, opt_css ){\r
var xnode;\r
- if( !this._tag ) return;\r
- this.append( xnode = X_Doc_create( tag, opt_attrs, opt_css ) );\r
+ if( !this[ '_tag' ] ) return;\r
+ this[ 'append' ]( xnode = X_Doc_create( tag, opt_attrs, opt_css ) );\r
return xnode;\r
};\r
+/**\r
+ * 挿入位置とタグ名等を指定して新規に子ノードを作成し、現在のノードに挿入する。\r
+ * @alias Node.prototype.createAt\r
+ * @param {number} [index] 挿入位置\r
+ * @param {string} [tag] タグ名\r
+ * @param {object} [opt_attrs=] 属性\r
+ * @param {object|string} [opt_css=] css\r
+ * @return {Node} 新規作成されたノード\r
+ * @example var child = parent.create( 2, 'div' );\r
+ */\r
function X_Node_createAt( index, tag, opt_attrs, opt_css ){\r
var xnode;\r
- if( !this._tag ) return;\r
- this.appendAt( index, xnode = X_Doc_create( tag, opt_attrs, opt_css ) );\r
+ if( !this[ '_tag' ] ) return;\r
+ this[ 'appendAt' ]( index, xnode = X_Doc_create( tag, opt_attrs, opt_css ) );\r
return xnode;\r
};\r
\r
-/* --------------------------------------\r
- * CreateText\r
+/**\r
+ * テキストを指定して新規にテキストノードを作成し、現在のノードに挿入する。\r
+ * @alias Node.prototype.createText\r
+ * @param {string} [tag] テキスト\r
+ * @return {Node} 新規作成されたノード\r
*/\r
function X_Node_createText( text ){\r
var xnode;\r
- if( !this._tag ) return;\r
- this.append( xnode = X_Doc_createText( text ) );\r
+ if( !this[ '_tag' ] ) return;\r
+ this[ 'append' ]( xnode = X_Doc_createText( text ) );\r
return xnode;\r
};\r
+/**\r
+ * 挿入位置とテキストを指定して新規に子ノードを作成し、現在のノードに挿入する。\r
+ * @alias Node.prototype.createTextAt\r
+ * @param {number} [index] 挿入位置\r
+ * @param {string} [tag] テキスト\r
+ * @return {Node} 新規作成されたノード\r
+ */\r
function X_Node_createTextAt( index, text ){\r
var xnode;\r
- if( !this._tag ) return;\r
- this.appendAt( index, xnode = X_Doc_createText( text ) );\r
+ if( !this[ '_tag' ] ) return;\r
+ this[ 'appendAt' ]( index, xnode = X_Doc_createText( text ) );\r
return xnode;\r
};\r
\r
-/* --------------------------------------\r
- * Clone\r
+/**\r
+ * Node のクローンを作成し返す。id もクローンされる点に注意。イベントリスナはクローンされない。\r
* http://d.hatena.ne.jp/think49/20110724/1311472811\r
* http://d.hatena.ne.jp/uupaa/20100508/1273299874\r
+ * @alias Node.prototype.clone\r
+ * @param {boolean} [opt_clone_children] 子要素のクローンを行うか？\r
+ * @return {Node}\r
*/\r
function X_Node_clone( opt_clone_children ){\r
var xnode, xnodes, i, l;\r
- if( this._tag ){\r
+ if( this[ '_tag' ] ){\r
X_Node_newByTag = true;\r
- xnode = new Node( this._tag, X_Object_clone( this._attrs ), X_Object_clone( this._css ) )\r
- .attr( { 'id' : this._id } )\r
- .className( this._className );\r
- if( opt_clone_children && ( xnodes = this._xnodes ) && ( l = xnodes.length ) ){\r
+ xnode = new Node( this[ '_tag' ], X_Object_clone( this[ '_attrs' ] ), X_Object_clone( this[ '_css' ] ) )\r
+ .attr( { 'id' : this[ '_id' ] } )\r
+ [ 'className' ]( this[ '_className' ] );\r
+ if( opt_clone_children && ( xnodes = this[ '_xnodes' ] ) && ( l = xnodes.length ) ){\r
for( i = 0; i < l; ++i ){\r
- xnode.append( xnodes[ i ].clone( true ) );\r
+ xnode[ 'append' ]( xnodes[ i ][ 'clone' ]( true ) );\r
};\r
};\r
return xnode; \r
};\r
X_Node_newByText = true;\r
- return new Node( this._text );\r
+ return new Node( this[ '_text' ] );\r
};\r
\r
-/* --------------------------------------\r
- * Add\r
- * Node\r
- * HtmlElement の場合は内部使用専用 そのため event の破棄等しない\r
+/**\r
+ * ノードを子配列の最後に追加する。文字列が渡された場合、HTMLパーサーによって Node ツリーを作成して追加する。HtmlElement, TextNode の場合は内部使用専用。\r
+ * @alias Node.prototype.clone\r
+ * @param {Node|string|HTMLElement|TextNode} [v] HTMLElement と TextNode は内部のみ。\r
+ * @return {Node} 自身。チェインメソッド\r
+ * @example myNode.append( node );\r
+ * myNode.append( nodeSprite, '<div>A</div>', 'B' );\r
*/\r
function X_Node_append( v ){\r
var i, l, xnodes, frg;\r
- if( !this._tag ) return;\r
+ if( !this[ '_tag' ] ) return;\r
\r
if( 1 < ( l = arguments.length ) ){\r
for( i = 0; i < l; ++i ){\r
- this.append( arguments[ i ] );\r
+ this[ 'append' ]( arguments[ i ] );\r
};\r
return this;\r
};\r
\r
- if( !( xnodes = this._xnodes ) ) this._xnodes = xnodes = [];\r
+ if( !( xnodes = this[ '_xnodes' ] ) ) this[ '_xnodes' ] = xnodes = [];\r
\r
switch( X_Node_getType( v ) ){\r
case X_Node_TYPE.RAW_HTML :\r
return this.append.apply( this, X_HtmlParser_parse( v, true ) );\r
case X_Node_TYPE.XNODE :\r
// 親の xnodes から v を消す\r
- v.parent && v.remove();\r
+ v.parent && v[ 'remove' ]();\r
// IE4 でテキストノードの追加、FIXED 済でない場合、親に要素の追加を通知\r
- if( X_UA[ 'IE4' ] && !v._tag && ( this._flags & X_Node_State.IE4_FIXED ) === 0 ) this._flags |= X_Node_State.IE4_DIRTY_CHILDREN;\r
+ if( X_UA[ 'IE4' ] && !v[ '_tag' ] && ( this[ '_flags' ] & X_Node_State.IE4_FIXED ) === 0 ) this[ '_flags' ] |= X_Node_State.IE4_DIRTY_CHILDREN;\r
break;\r
default :\r
return this;\r
\r
v.parent = this;\r
xnodes[ xnodes.length ] = v;\r
- if( this._flags & X_Node_State.IN_TREE ){\r
- v._flags |= X_Node_State.IN_TREE;\r
- v._xnodes && X_Node_toggleInTreeFlag( v._xnodes, true );\r
+ if( this[ '_flags' ] & X_Node_State.IN_TREE ){\r
+ v[ '_flags' ] |= X_Node_State.IN_TREE;\r
+ v[ '_xnodes' ] && X_Node_toggleInTreeFlag( v[ '_xnodes' ], true );\r
X_Node_reserveUpdate();\r
};\r
return this;\r
};\r
\r
-\r
+/**\r
+ * ノードを挿入位置に追加する。\r
+ * @alias Node.prototype.clone\r
+ * @param {number} index 挿入位置 0以上\r
+ * @param {Node|string|HTMLElement|TextNode} [v] HTMLElement と TextNode は内部のみ。\r
+ * @return {Node} 自身。チェインメソッド\r
+ * @example myNode.appendAt( 1, node );\r
+ */\r
function X_Node_appendAt( start, v ){\r
var xnodes, l, i;\r
\r
- if( !this._tag ) return this;\r
+ if( !this[ '_tag' ] ) return this;\r
\r
l = arguments.length;\r
- if( !( xnodes = this._xnodes ) ) xnodes = this._xnodes = [];\r
+ if( !( xnodes = this[ '_xnodes' ] ) ) xnodes = this[ '_xnodes' ] = [];\r
\r
if( xnodes.length <= start ){\r
- if( l === 2 ) return this.append( v );\r
+ if( l === 2 ) return this[ 'append' ]( v );\r
for( i = 1; i < l; ++i ){\r
- this.append( arguments[ i ] );\r
+ this[ 'append' ]( arguments[ i ] );\r
};\r
return this;\r
};\r
if( start < 0 ) start = 0;\r
if( 2 < l ){\r
for( ; l; ){\r
- this.appendAt( start, arguments[ --l ] );\r
+ this[ 'appendAt' ]( start, arguments[ --l ] );\r
};\r
return this;\r
};\r
case X_Node_TYPE.STRING :\r
v = X_HtmlParser_parse( v, true );\r
for( i = v.length; i; ){\r
- this.appendAt( start, v[ --i ] );\r
+ this[ 'appendAt' ]( start, v[ --i ] );\r
};\r
return this;\r
case X_Node_TYPE.XNODE :\r
// 親の xnodes から v を消す\r
- v.parent && v.remove();\r
+ v.parent && v[ 'remove' ]();\r
// IE4 でテキストノードの追加、FIXED 済でない場合、親に要素の追加を通知\r
- if( X_UA[ 'IE4' ] && !v._tag && ( this._flags & X_Node_State.IE4_FIXED ) === 0 ) this._flags |= X_Node_State.IE4_DIRTY_CHILDREN;\r
+ if( X_UA[ 'IE4' ] && !v[ '_tag' ] && ( this[ '_flags' ] & X_Node_State.IE4_FIXED ) === 0 ) this[ '_flags' ] |= X_Node_State.IE4_DIRTY_CHILDREN;\r
break;\r
default :\r
return this;\r
};\r
\r
v.parent = this;\r
- this._xnodes.splice( start, 0, v );\r
- if( this._flags & X_Node_State.IN_TREE ){\r
- v._flags |= X_Node_State.IN_TREE;\r
- v._xnodes && X_Node_toggleInTreeFlag( v._xnodes, true );\r
+ this[ '_xnodes' ].splice( start, 0, v );\r
+ if( this[ '_flags' ] & X_Node_State.IN_TREE ){\r
+ v[ '_flags' ] |= X_Node_State.IN_TREE;\r
+ v[ '_xnodes' ] && X_Node_toggleInTreeFlag( v[ '_xnodes' ], true );\r
X_Node_reserveUpdate();\r
};\r
return this;\r
default :\r
return this;\r
};\r
- opt_index === undefined ? parent.append( this ) : parent.appendAt( opt_index, this );\r
- return this;\r
-};\r
-\r
-function X_Node_appendToRoot( opt_index ){\r
- opt_index === undefined ? X_Node_body.append( this ) : X_Node_body.appendAt( opt_index, this );\r
+ opt_index === undefined ? parent[ 'append' ]( this ) : parent[ 'appendAt' ]( opt_index, this );\r
return this;\r
};\r
\r
// getter\r
if( v === undefined ){\r
if( !parent ) return;\r
- xnodes = parent._xnodes;\r
+ xnodes = parent[ '_xnodes' ];\r
i = xnodes.indexOf( this );\r
return 0 < i ? xnodes[ i - 1 ] : v;\r
};\r
if( !parent ) return this;\r
\r
l = arguments.length;\r
- start = this.getOrder();\r
+ start = this[ 'getOrder' ]();\r
if( 1 < l ){\r
for( ; l; ){\r
- parent.appendAt( start, arguments[ --l ] );\r
+ parent[ 'appendAt' ]( start, arguments[ --l ] );\r
};\r
return this;\r
};\r
- parent.appendAt( start, v );\r
+ parent[ 'appendAt' ]( start, v );\r
return this;\r
};\r
\r
// getter\r
if( v === undefined ){\r
if( !parent ) return;\r
- xnodes = parent._xnodes;\r
+ xnodes = parent[ '_xnodes' ];\r
i = xnodes.indexOf( this );\r
return ++i < xnodes.length ? xnodes[ i ] : v;\r
};\r
if( !parent ) return this;\r
\r
l = arguments.length;\r
- start = this.getOrder() + 1;\r
- if( parent._xnodes.length <= start ){\r
+ start = this[ 'getOrder' ]() + 1;\r
+ if( parent[ '_xnodes' ].length <= start ){\r
if( 1 < l ){\r
for( i = 0; i < l; ++i ){\r
- parent.append( arguments[ i ] );\r
+ parent[ 'append' ]( arguments[ i ] );\r
};\r
return this;\r
};\r
- parent.append( v );\r
+ parent[ 'append' ]( v );\r
return this;\r
};\r
if( 1 < l ){\r
for( ; l; ){\r
- parent.appendAt( start, arguments[ --l ] );\r
+ parent[ 'appendAt' ]( start, arguments[ --l ] );\r
};\r
return this;\r
};\r
- parent.appendAt( start, v );\r
+ parent[ 'appendAt' ]( start, v );\r
return this;\r
};\r
\r
function X_Node_swap( v ){\r
if( !this.parent ) return this;\r
- return arguments.length === 1 ? this.before( v ).remove() : this.before.apply( this, arguments ).remove();\r
+ return arguments.length === 1 ? this[ 'prev' ]( v )[ 'remove' ]() : X_Node_before.apply( this, arguments )[ 'remove' ]();\r
};\r
\r
/* --------------------------------------\r
if( !parent ) return this;\r
\r
delete this.parent;\r
- parent._xnodes.splice( parent._xnodes.indexOf( this ), 1 );\r
+ parent[ '_xnodes' ].splice( parent[ '_xnodes' ].indexOf( this ), 1 );\r
\r
- if( this._flags & X_Node_State.IN_TREE ){\r
- this._flags &= ~X_Node_State.IN_TREE & ~X_Node_State.IE5_DISPLAY_NONE_FIX;\r
- this._xnodes && X_Node_toggleInTreeFlag( this._xnodes, false );\r
+ if( this[ '_flags' ] & X_Node_State.IN_TREE ){\r
+ this[ '_flags' ] &= ~X_Node_State.IN_TREE & ~X_Node_State.IE5_DISPLAY_NONE_FIX;\r
+ this[ '_xnodes' ] && X_Node_toggleInTreeFlag( this[ '_xnodes' ], false );\r
\r
if( X_UA_DOM.IE4 ){\r
- elm = this._rawObject || X_Node__ie4getRawNode( this );\r
+ elm = this[ '_rawObject' ] || X_Node__ie4getRawNode( this );\r
if( elm ){\r
X_Node_reserveRemoval[ X_Node_reserveRemoval.length ] = this;\r
X_Node_reserveUpdate(); \r
} else\r
- if( !this._tag && ( parent._flags & X_Node_State.IE4_FIXED ) === 0 ){\r
- parent._flags |= X_Node_State.IE4_DIRTY_CHILDREN;\r
+ if( !this[ '_tag' ] && ( parent[ '_flags' ] & X_Node_State.IE4_FIXED ) === 0 ){\r
+ parent[ '_flags' ] |= X_Node_State.IE4_DIRTY_CHILDREN;\r
};\r
} else {\r
- elm = this._rawObject;\r
+ elm = this[ '_rawObject' ];\r
if( elm && elm.parentNode && elm.parentNode.tagName ){\r
X_Node_reserveRemoval[ X_Node_reserveRemoval.length ] = this;\r
X_Node_reserveUpdate(); \r
};\r
\r
function X_Node_empty(){\r
- var xnodes = this._xnodes, i;\r
+ var xnodes = this[ '_xnodes' ], i;\r
if( xnodes && ( i = xnodes.length ) ){\r
for( ; i; ){\r
xnodes[ --i ].destroy();\r
*/\r
\r
function X_Node_destroy( isChild ){\r
- var xnodes = this._xnodes, i, elm;\r
+ var xnodes = this[ '_xnodes' ], i, elm;\r
\r
- if( ( this._flags & X_Node_State.EXIST ) === 0 ) return;\r
+ if( ( this[ '_flags' ] & X_Node_State.EXIST ) === 0 ) return;\r
\r
- elm = this._rawObject || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this );\r
+ elm = this[ '_rawObject' ] || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this );\r
\r
if( xnodes && ( i = xnodes.length ) ){\r
//for( ; i; ){\r
// xnodes[ --i ].destroy( true );\r
//};\r
};\r
- elm && this._listeners && this.unlisten(); // イベントの退避\r
+ elm && this._listeners && this[ 'unlisten' ](); // イベントの退避\r
\r
- if( this._flags & X_Node_State.IN_TREE ){\r
- !isChild && this.remove();\r
- this._flags &= ~X_Node_State.EXIST;\r
+ if( this[ '_flags' ] & X_Node_State.IN_TREE ){\r
+ !isChild && this[ 'remove' ]();\r
+ this[ '_flags' ] &= ~X_Node_State.EXIST;\r
} else {\r
- this.parent && this.parent._xnodes.splice( this.parent._xnodes.indexOf( this ), 1 );\r
+ this.parent && this.parent[ '_xnodes' ].splice( this.parent[ '_xnodes' ].indexOf( this ), 1 );\r
elm && !isChild && X_Node__actualRemove( this );\r
- this.kill();\r
+ this[ 'kill' ]();\r
};\r
\r
- delete X_Node_CHASHE[ this._uid ];\r
+ delete X_Node_CHASHE[ this[ '_uid' ] ];\r
};\r
\r
function X_Node_onBeforeKill( e ){\r
- var xnodes = this._xnodes, i, elm;\r
+ var xnodes = this[ '_xnodes' ], i, elm;\r
\r
- if( ( this._flags & X_Node_State.EXIST ) === 0 ) return X.Callback.NONE;\r
+ if( ( this[ '_flags' ] & X_Node_State.EXIST ) === 0 ) return X_Callback_NONE;\r
\r
- elm = this._rawObject || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this );\r
- elm && this._listeners && this.unlisten(); // イベントの退避\r
+ elm = this[ '_rawObject' ] || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this );\r
+ elm && this._listeners && this[ 'unlisten' ](); // イベントの退避\r
\r
if( xnodes && ( i = xnodes.length ) ){\r
for( ; i; ){\r
};\r
};\r
\r
- delete X_Node_CHASHE[ this._uid ];\r
+ delete X_Node_CHASHE[ this[ '_uid' ] ];\r
\r
if( e ){\r
- this.remove();\r
+ this[ 'remove' ]();\r
if( X_Node_reserveRemoval[ X_Node_reserveRemoval.length - 1 ] === this ){\r
- this._flags &= ~X_Node_State.EXIST;\r
- return X.Callback.PREVENT_DEFAULT; \r
+ this[ '_flags' ] &= ~X_Node_State.EXIST;\r
+ return X_Callback_PREVENT_DEFAULT; \r
}; \r
};\r
- return X.Callback.NONE;\r
+ return X_Callback_NONE;\r
};\r
\r
\r
*/\r
function X_Node_contains( v ){\r
var elm, type, xnodes, i;\r
- if( !v || !this._tag || this === v ) return false;\r
+ if( !v || !this[ '_tag' ] || this === v ) return false;\r
// contains ie4+\r
- if( ( elm = this._rawObject || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this ) ) && document.contains && ( type = X_Node_getType( v ) ) && ( type === X_Node_TYPE.RAW_HTML || type === X_Node_TYPE.RAW_TEXT ) ){\r
- return elm.contains( v ); \r
+ if( ( elm = this[ '_rawObject' ] || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this ) ) && document.contains && ( type = X_Node_getType( v ) ) && ( type === X_Node_TYPE.RAW_HTML || type === X_Node_TYPE.RAW_TEXT ) ){\r
+ return elm[ 'contains' ]( v ); \r
};\r
//if( document.compareDocumentPosition ){\r
// \r
//};\r
- xnodes = this._xnodes;\r
+ xnodes = this[ '_xnodes' ];\r
if( !xnodes || !xnodes.length ) return false;\r
if( xnodes.indexOf( v ) !== -1 ) return true; // fast\r
if( elm === v.parentNode ) return true;\r
for( i = xnodes.length; i; ){\r
- if( xnodes[ --i ].contains( v ) ) return true;\r
+ if( xnodes[ --i ][ 'contains' ]( v ) ) return true;\r
};\r
return false;\r
};\r
* getChild\r
*/\r
function X_Node_getChildAt( i ){\r
- var xnodes = this._xnodes;\r
+ var xnodes = this[ '_xnodes' ];\r
return xnodes && 0 <= i && i < xnodes.length && xnodes[ i ];\r
};\r
\r
function X_Node_length(){\r
- var xnodes = this._xnodes;\r
+ var xnodes = this[ '_xnodes' ];\r
return xnodes ? xnodes.length : 0;\r
};\r
\r
* firstChild, lastChild\r
*/\r
function X_Node_firstChild(){\r
- return this.getChildAt( 0 );\r
+ return this[ '_xnodes' ] && this[ '_xnodes' ][ 0 ];\r
};\r
function X_Node_lastChild(){\r
- return this.getChildAt( this._xnodes.length - 1 );\r
+ var xnodes = this[ '_xnodes' ];\r
+ return xnodes && xnodes[ xnodes.length - 1 ];\r
};\r
\r
/* --------------------------------------\r
function X_Node_getOrder(){\r
var parent = this.parent;\r
if( !parent ) return -1;\r
- return parent._xnodes.indexOf( this );\r
+ return parent[ '_xnodes' ].indexOf( this );\r
};\r
\r
/* --------------------------------------\r
function X_Node_className( v ){\r
var node, _, __;\r
// getter\r
- if( v === undefined ) return this._className;\r
+ if( v === undefined ) return this[ '_className' ];\r
\r
// setter\r
- if( this._className === v ) return this;\r
+ if( this[ '_className' ] === v ) return this;\r
if( !v || !X_Type_isString( v ) ){\r
- delete this._className;\r
+ delete this[ '_className' ];\r
} else {\r
// cleanup\r
_ = ' ';\r
v.charAt( 0 ) === _ && ( v = v.substr( 1 ) );\r
v.lastIndexOf( _ ) === 0 && ( v = v.substr( 0, v.length - 1 ) );\r
\r
- if( this._className === v ) return this;\r
- v ? ( this._className = v ) : delete this._className;\r
+ if( this[ '_className' ] === v ) return this;\r
+ v ? ( this[ '_className' ] = v ) : delete this[ '_className' ];\r
};\r
- this._flags |= X_Node_State.DIRTY_CLASSNAME;\r
- this._flags & X_Node_State.IN_TREE && X_Node_reserveUpdate();\r
+ this[ '_flags' ] |= X_Node_State.DIRTY_CLASSNAME;\r
+ this[ '_flags' ] & X_Node_State.IN_TREE && X_Node_reserveUpdate();\r
return this;\r
};\r
function X_Node_addClass( v ){\r
for( ; i; ){\r
name = names[ --i ];\r
if( !name ) continue;\r
- !this.hasClass( name ) && ( v += ( v ? ' ' : '' ) + name );\r
+ !this[ 'hasClass' ]( name ) && ( v += ( v ? ' ' : '' ) + name );\r
};\r
- return v ? this.className( this._className + ( this._className ? ' ' : '' ) + v ) : this;\r
+ return v ? this[ 'className' ]( this[ '_className' ] + ( this[ '_className' ] ? ' ' : '' ) + v ) : this;\r
};\r
function X_Node_removeClass( v ){\r
var _ = ' ',\r
- className = this._className,\r
+ className = this[ '_className' ],\r
names = v.split( _ ),\r
classNames, i, f, j;\r
if( !className ) return this;\r
};\r
};\r
};\r
- return f ? this.className( classNames.join( _ ) ) : this;\r
+ return f ? this[ 'className' ]( classNames.join( _ ) ) : this;\r
};\r
function X_Node_toggleClass( v, opt_toggle ){\r
var names, i, name;\r
if( opt_toggle !== undefined ){\r
- return !!opt_toggle ? this.addClass( v ) : this.removeClass( v ); \r
+ return !!opt_toggle ? this[ 'addClass' ]( v ) : this[ 'removeClass' ]( v ); \r
};\r
names = v.split( ' ' );\r
for( i = names.length; i; ){\r
name = names[ --i ];\r
- this.hasClass( name ) ? this.removeClass( name ) : this.addClass( name );\r
+ this[ 'hasClass' ]( name ) ? this[ 'removeClass' ]( name ) : this[ 'addClass' ]( name );\r
};\r
return this;\r
};\r
function X_Node_hasClass( v ){\r
var _ = ' ',\r
- className = this._className,\r
+ className = this[ '_className' ],\r
i, name;\r
if( className === v ) return true;\r
if( !className ) return false;\r
var _ = '', q = '"', xnodes, n, i, l;\r
// setter\r
if( html !== undefined ){ // String 以外に Number や false null なども許可\r
- if( !this._tag ) return this.text( html );\r
- return html ? this.empty().append.apply( this, X_HtmlParser_parse( html, true ) ) : this.empty();\r
+ if( !this[ '_tag' ] ) return this[ 'text' ]( html );\r
+ return html ? this[ 'empty' ]().append.apply( this, X_HtmlParser_parse( html, true ) ) : this[ 'empty' ]();\r
};\r
\r
// getter\r
- if( !this._tag ){\r
- return this._text;\r
+ if( !this[ '_tag' ] ){\r
+ return this[ '_text' ];\r
};\r
\r
- this._flags & X_Node_State.OLD_CSSTEXT && X_Node_CSS_objToCssText( this );\r
+ this[ '_flags' ] & X_Node_State.OLD_CSSTEXT && X_Node_CSS_objToCssText( this );\r
\r
html = !X_Node_outerXNode ? [] : [\r
- '<', this._tag,\r
- this._id ? ' id="' + this._id + q : _,\r
- this._className ? ' class="' + this._className + q : _,\r
- this._flags & X_Node_State.OLD_ATTRTEXT ? X_Node_Attr_objToAttrText( this ) : this._attrText,\r
- this._cssText ? ' style="' + this._cssText + q : _,\r
+ '<', this[ '_tag' ],\r
+ this[ '_id' ] ? ' id="' + this[ '_id' ] + q : _,\r
+ this[ '_className' ] ? ' class="' + this[ '_className' ] + q : _,\r
+ this[ '_flags' ] & X_Node_State.OLD_ATTRTEXT ? X_Node_Attr_objToAttrText( this ) : this[ '_attrText' ],\r
+ this[ '_cssText' ] ? ' style="' + this[ '_cssText' ] + q : _,\r
'>' ];\r
\r
n = html.length;\r
- if( ( xnodes = this._xnodes ) && ( l = xnodes.length ) ){\r
+ if( ( xnodes = this[ '_xnodes' ] ) && ( l = xnodes.length ) ){\r
if( !X_Node_outerXNode ) X_Node_outerXNode = this;\r
for( i = 0; i < l; ++i ){\r
- html[ n ] = xnodes[ i ].html();\r
+ html[ n ] = xnodes[ i ][ 'html' ]();\r
++n;\r
};\r
if( X_Node_outerXNode === this ) X_Node_outerXNode = null;\r
};\r
- !X_Node_outerXNode || X_Dom_DTD_EMPTY[ this._tag ] || ( html[ n ] = '<\/' + this._tag + '>' );\r
+ !X_Node_outerXNode || X_Dom_DTD_EMPTY[ this[ '_tag' ] ] || ( html[ n ] = '<\/' + this[ '_tag' ] + '>' );\r
return html.join( _ );\r
};\r
\r
if( text === null ) text = '';\r
text += '';\r
\r
- if( !this._tag ){\r
- if( this._text !== text ){\r
- text ? ( this._text = text ) : delete this._text;\r
- this._flags |= X_Node_State.DIRTY_CONTENT; \r
- this._flags & X_Node_State.IN_TREE && X_Node_reserveUpdate();\r
+ if( !this[ '_tag' ] ){\r
+ if( this[ '_text' ] !== text ){\r
+ text ? ( this[ '_text' ] = text ) : delete this[ '_text' ];\r
+ this[ '_flags' ] |= X_Node_State.DIRTY_CONTENT; \r
+ this[ '_flags' ] & X_Node_State.IN_TREE && X_Node_reserveUpdate();\r
};\r
return this;\r
};\r
- if( ( xnodes = this._xnodes ) && xnodes.length === 1 && !xnodes[ 0 ]._tag ){\r
- xnodes[ 0 ].text( text );\r
+ if( ( xnodes = this[ '_xnodes' ] ) && xnodes.length === 1 && !xnodes[ 0 ][ '_tag' ] ){\r
+ xnodes[ 0 ][ 'text' ]( text );\r
return this;\r
};\r
// TODO 一つのtextnode を残すケース 完全に削除したい場合は empty()を使う\r
- if( !text ) return this.empty(); \r
- this.empty().createText( text );\r
+ if( !text ) return this[ 'empty' ](); \r
+ this[ 'empty' ]()[ 'createText' ]( text );\r
return this;\r
};\r
// getter\r
- if( this._tag ){\r
- if( ( xnodes = this._xnodes ) && ( l = xnodes.length ) ){\r
+ if( this[ '_tag' ] ){\r
+ if( ( xnodes = this[ '_xnodes' ] ) && ( l = xnodes.length ) ){\r
for( texts = [], i = 0; i < l; ++i ){\r
- texts[ i ] = xnodes[ i ].text();\r
+ texts[ i ] = xnodes[ i ][ 'text' ]();\r
};\r
return texts.join( '' );\r
};\r
return '';\r
};\r
- return this._text;\r
+ return this[ '_text' ];\r
};\r
\r
/*\r
\r
switch( name ){\r
case 'nodeType' :\r
- return this._tag ? 1 : 3;\r
+ return this[ '_tag' ] ? 1 : 3;\r
case 'text' :\r
- return this.text();\r
+ return this[ 'text' ]();\r
case 'html' :\r
case 'innerHTML' :\r
- return this.html();\r
+ return this[ 'html' ]();\r
case 'outerHTML' :\r
X_Node_outerXNode = X_Node_body; // == true ならなんでもよい。型を合わすために xbody にしている\r
- v = this.html();\r
+ v = this[ 'html' ]();\r
X_Node_outerXNode = null;\r
return v;\r
case 'fontSize' :\r
return X_Node_CSS_getCharSize( this );\r
case 'inGPU' :\r
- return !!( this._flags & ( X_Node_State.GPU_NOW | X_Node_State.GPU_RELEASE_RESERVED ) );\r
+ return !!( this[ '_flags' ] & ( X_Node_State.GPU_NOW | X_Node_State.GPU_RELEASE_RESERVED ) );\r
};\r
\r
- raw = this._rawObject || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this );\r
+ raw = this[ '_rawObject' ] || X_UA_DOM.IE4 && X_Node__ie4getRawNode( this );\r
if( !raw ) return;\r
\r
if( name === 'scrollTo' ){\r
*/\r
\r
function X_Node_reserveUpdate(){\r
- if( !X_Node_updateTimerID ) X_Node_updateTimerID = X.Timer.requestFrame( X_Node_startUpdate );\r
+ if( !X_Node_updateTimerID ) X_Node_updateTimerID = X_Timer_requestFrame( X_Node_startUpdate );\r
};\r
\r
var X_Node_updateReservedByReleaseGPU = false;\r
function X_Node_startUpdate( time ){\r
var removal, i, xnode;\r
\r
- if( !X_Node_updateTimerID || X_ViewPort_readyState < X_TEMP.SYSTEM_EVENT_INIT ){\r
+ if( !X_Node_updateTimerID || X_ViewPort_readyState < X_EVENT_INIT ){\r
return;\r
};\r
\r
- X.Timer.cancelFrame( X_Node_updateTimerID );\r
+ X_Timer_cancelFrame( X_Node_updateTimerID );\r
X_Node_updateTimerID = 0;\r
\r
if( time ){\r
// X.Timer 経由でないと発火しない このイベントでサイズを取ると無限ループに\r
- X_System._listeners && X_System._listeners[ X_Event.BEFORE_UPDATE ] && X_System.dispatch( X_Event.BEFORE_UPDATE );\r
+ X_System._listeners && X_System._listeners[ X_EVENT_BEFORE_UPDATE ] && X_System[ 'dispatch' ]( X_EVENT_BEFORE_UPDATE );\r
};\r
\r
removal = X_Node_reserveRemoval;\r
xnode = removal[ --i ];\r
// TODO GPU レイヤーの子の場合、remove をスキップする。 非GPU レイヤーへ apppend される場合、clone する?\r
X_Node__actualRemove( xnode );\r
- ( xnode._flags & X_Node_State.EXIST ) === 0 && xnode.kill();\r
+ ( xnode[ '_flags' ] & X_Node_State.EXIST ) === 0 && xnode[ 'kill' ]();\r
};\r
removal.length = 0;\r
};\r
\r
- if( X_Node_html._flags & X_Node_BitMask_IS_DIRTY ){\r
- X_Node__commitUpdate( X_Node_html, X_Node_html._rawObject.parentNode, null, X_Node_html._flags );\r
+ if( X_Node_html[ '_flags' ] & X_Node_BitMask_IS_DIRTY ){\r
+ X_Node__commitUpdate( X_Node_html, X_Node_html[ '_rawObject' ].parentNode, null, X_Node_html[ '_flags' ] );\r
} else {\r
- X_Node__commitUpdate( X_Node_head, X_Node_head._rawObject.parentNode, null, X_Node_head._flags );\r
- X_Node__commitUpdate( X_Node_body, X_Node_body._rawObject.parentNode, null, X_Node_body._flags );\r
+ X_Node__commitUpdate( X_Node_head, X_Node_head[ '_rawObject' ].parentNode, null, X_Node_head[ '_flags' ] );\r
+ X_Node__commitUpdate( X_Node_body, X_Node_body[ '_rawObject' ].parentNode, null, X_Node_body[ '_flags' ] );\r
};\r
\r
if( X_Node_updateReservedByReleaseGPU ){\r
\r
if( time ){\r
// X.Timer 経由でないと発火しない このイベントでサイズを取ると無限ループに\r
- X_System._listeners && X_System._listeners[ X_Event.UPDATED ] && X_System.dispatch( X_Event.UPDATED ); \r
+ X_System._listeners && X_System._listeners[ X_EVENT_UPDATED ] && X_System[ 'dispatch' ]( X_EVENT_UPDATED ); \r
};\r
\r
- X_ViewPort._listeners && X_ViewPort._listeners[ X_Event.AFTER_UPDATE ] && X_ViewPort.asyncDispatch( X_Event.AFTER_UPDATE );\r
+ X_ViewPort._listeners && X_ViewPort._listeners[ X_EVENT_AFTER_UPDATE ] && X_ViewPort[ 'asyncDispatch' ]( X_EVENT_AFTER_UPDATE );\r
};\r
\r
/*\r
var X_Node__commitUpdate =\r
X_UA_DOM.W3C ?\r
( function( that, parentElement, nextElement, accumulatedFlags ){\r
- var elm = that._rawObject,\r
+ var elm = that[ '_rawObject' ],\r
created, xnodes, l, next;\r
\r
// 1. GPU 一切の更新をスキップ\r
- if( that._flags & X_Node_State.GPU_NOW ){\r
- console.log( '更新のskip ' + !!( that._flags & X_Node_BitMask_IS_DIRTY ) );\r
- that._flags & X_Node_BitMask_IS_DIRTY && X_Node__updateRawNode( that, elm );\r
+ if( that[ '_flags' ] & X_Node_State.GPU_NOW ){\r
+ console.log( '更新のskip ' + !!( that[ '_flags' ] & X_Node_BitMask_IS_DIRTY ) );\r
+ that[ '_flags' ] & X_Node_BitMask_IS_DIRTY && X_Node__updateRawNode( that, elm );\r
return elm;\r
};\r
\r
// 2. GPU解放予約\r
// TODO もしかしたらこのタイミングで更新できるかも。\r
- if( that._flags & X_Node_State.GPU_RELEASE_RESERVED ){\r
+ if( that[ '_flags' ] & X_Node_State.GPU_RELEASE_RESERVED ){\r
console.log( 'GPU 解放 ' );\r
//X_Node_updateReservedByReleaseGPU = true;\r
//X_Node__updateRawNode( that, elm );\r
- that._flags &= X_Node_BitMask_RESET_GPU;\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_GPU;\r
//return elm;\r
};\r
\r
// 3. GPU予約 -> GPU\r
- if( that._flags & X_Node_State.GPU_RESERVED ){\r
- that._flags &= X_Node_BitMask_RESET_GPU;\r
- that._flags |= X_Node_State.GPU_NOW;\r
+ if( that[ '_flags' ] & X_Node_State.GPU_RESERVED ){\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_GPU;\r
+ that[ '_flags' ] |= X_Node_State.GPU_NOW;\r
};\r
\r
// 4. style="display:none" の場合\r
- if( that._flags & X_Node_State.STYLE_IS_DISPLAY_NONE ){\r
+ if( that[ '_flags' ] & X_Node_State.STYLE_IS_DISPLAY_NONE ){\r
if( X_Node_displayNoneFixForIE5 ){\r
// filter の効いている要素を含む要素は display:none が無視される。\r
// filter = '' で削除はできるが、再表示時に filter が消える。 -> filter な要素を削除してしまう。 \r
};\r
\r
// 5. ie5 非表示fixフラグ\r
- accumulatedFlags |= that._flags;\r
+ accumulatedFlags |= that[ '_flags' ];\r
\r
- if( that._flags & X_Node_State.IE5_DISPLAY_NONE_FIX ){\r
+ if( that[ '_flags' ] & X_Node_State.IE5_DISPLAY_NONE_FIX ){\r
if( accumulatedFlags & ( X_Node_State.DIRTY_POSITION | X_Node_State.DIRTY_ID | X_Node_State.DIRTY_CLASSNAME ) === 0 ){\r
return nextElement;\r
};\r
\r
// 6. 要素の生成\r
if( !elm ){\r
- if( !that._tag ){\r
- that._flags &= X_Node_BitMask_RESET_DIRTY;\r
- that._rawObject = elm = document.createTextNode( X_String_chrReferanceTo( that._text ) );\r
+ if( !that[ '_tag' ] ){\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
+ that[ '_rawObject' ] = elm = document.createTextNode( X_String_chrReferanceTo( that[ '_text' ] ) );\r
if( !X_UA[ 'IE' ] ){\r
- elm.UID = that._uid;\r
+ elm[ 'UID' ] = that[ '_uid' ];\r
};\r
} else\r
if( X_Node_strictElmCreation ){\r
- that._flags & X_Node_State.OLD_CSSTEXT && X_Node_CSS_objToCssText( that, true ); // OLD_CSSTEXT ??\r
+ that[ '_flags' ] & X_Node_State.OLD_CSSTEXT && X_Node_CSS_objToCssText( that, true ); // OLD_CSSTEXT ??\r
\r
- that._rawObject = elm =\r
+ that[ '_rawObject' ] = elm =\r
document.createElement( [\r
- '<', that._tag,\r
- ' UID="', that._uid, '"',\r
- that._id ? ' id="' + that._id + '"' : '',\r
- that._className ? ' class="' + that._className + '"' : '',\r
+ '<', that[ '_tag' ],\r
+ ' UID="', that[ '_uid' ], '"',\r
+ that[ '_id' ] ? ' id="' + that[ '_id' ] + '"' : '',\r
+ that[ '_className' ] ? ' class="' + that[ '_className' ] + '"' : '',\r
X_Node_Attr_objToAttrText( that, true ),\r
- that._cssText ? ' style="' + that._cssText + '"' : '',\r
+ that[ '_cssText' ] ? ' style="' + that[ '_cssText' ] + '"' : '',\r
'>' ].join( '' ) );\r
} else {\r
- that._rawObject = elm = document.createElement( that._tag );\r
+ that[ '_rawObject' ] = elm = document.createElement( that[ '_tag' ] );\r
};\r
\r
// IE には要素追加のタイミングで起こるメモリリークがありここで追加\r
parentElement.appendChild( elm );\r
};\r
\r
- if( that._tag ){\r
+ if( that[ '_tag' ] ){\r
X_EventDispatcher_toggleAllEvents( that, true );// イベントの復帰 \r
- that._flags |= X_Node_State.ACTUAL_LISTENING;\r
+ that[ '_flags' ] |= X_Node_State.ACTUAL_LISTENING;\r
\r
if( X_Node_documentFragment ){\r
//( frg = X_Node_documentFragment ).appendChild( elm );\r
};\r
\r
if( X_Node_strictElmCreation ){\r
- that._flags &= X_Node_BitMask_RESET_DIRTY;\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
// ie の string から要素を作る場合、ネットワーク系属性は onload イベントなどを拾うために、要素生成->イベント復帰後に適用する\r
- that._newAttrs && ( that._flags |= X_Node_State.DIRTY_ATTR ); // _newAttrs には ネットワーク系属性が入っている。Network 系の属性は遅らせて設定\r
- that._flags |= X_Node_State.DIRTY_IE_FILTER;// doc 追加後に filter を指定しないと有効にならない。\r
+ that[ '_newAttrs' ] && ( that[ '_flags' ] |= X_Node_State.DIRTY_ATTR ); // _newAttrs には ネットワーク系属性が入っている。Network 系の属性は遅らせて設定\r
+ that[ '_flags' ] |= X_Node_State.DIRTY_IE_FILTER;// doc 追加後に filter を指定しないと有効にならない。\r
} else {\r
- elm.UID = that._uid;\r
- that._newAttrs = that._attrs;\r
- that._flags &= X_Node_BitMask_RESET_DIRTY;\r
- that._flags |= X_Node_State.DIRTY_ID | X_Node_State.DIRTY_CLASSNAME | X_Node_State.DIRTY_ATTR | X_Node_State.DIRTY_CSS | X_Node_State.DIRTY_IE_FILTER;\r
+ elm[ 'UID' ] = that[ '_uid' ];\r
+ that[ '_newAttrs' ] = that[ '_attrs' ];\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
+ that[ '_flags' ] |= X_Node_State.DIRTY_ID | X_Node_State.DIRTY_CLASSNAME | X_Node_State.DIRTY_ATTR | X_Node_State.DIRTY_CSS | X_Node_State.DIRTY_IE_FILTER;\r
\r
// http://outcloud.blogspot.jp/2010/09/iframe.html\r
// この問題は firefox3.6 で確認\r
if( X_UA[ 'Gecko' ] ){\r
- if( that._tag === 'IFRAME' && ( !that._attrs || !that._attrs[ 'src' ] ) ){\r
+ if( that[ '_tag' ] === 'IFRAME' && ( !that[ '_attrs' ] || !that[ '_attrs' ][ 'src' ] ) ){\r
//elm.contentWindow.location.replace = elm.src = 'about:blank';\r
that.attr( 'src', 'about:blank' );\r
};\r
parentElement.appendChild( elm );\r
};\r
\r
- if( that._listeners && ( that._flags & X_Node_State.ACTUAL_LISTENING ) === 0 ){\r
+ if( that._listeners && ( that[ '_flags' ] & X_Node_State.ACTUAL_LISTENING ) === 0 ){\r
X_EventDispatcher_toggleAllEvents( that, true );// イベントの退避\r
- that._flags |= X_Node_State.ACTUAL_LISTENING;\r
+ that[ '_flags' ] |= X_Node_State.ACTUAL_LISTENING;\r
};\r
\r
// 8. 更新の適用\r
if( accumulatedFlags & X_Node_BitMask_IS_DIRTY ){\r
- delete that._fontSize;\r
+ delete that[ '_fontSize' ];\r
X_Node__updateRawNode( that, elm );\r
};\r
\r
// 親及び自身へのクラス・id指定で display : none になるケースがありそれを検出\r
// 生成と破棄が繰り返されてしまう、親と自身の id, class が変わった場合だけ再生成。 accumulatedFlags & ( ID | CLASSNAME )\r
// currentStyle を観ていたときはエラーで停止する、alert と挟むと正常に動いて支離滅裂\r
- if( X_Node_displayNoneFixForIE5 && that._tag ){\r
+ if( X_Node_displayNoneFixForIE5 && that[ '_tag' ] ){\r
if( elm.runtimeStyle.display === 'none' ){\r
X_Node__actualRemove( that );\r
- that._flags |= X_Node_State.IE5_DISPLAY_NONE_FIX;\r
+ that[ '_flags' ] |= X_Node_State.IE5_DISPLAY_NONE_FIX;\r
return nextElement; \r
} else {\r
- that._flags &= ~X_Node_State.IE5_DISPLAY_NONE_FIX;\r
+ that[ '_flags' ] &= ~X_Node_State.IE5_DISPLAY_NONE_FIX;\r
};\r
};\r
\r
// 10. 子要素の更新。\r
- if( ( xnodes = that._xnodes ) && ( l = xnodes.length ) ) {\r
+ if( ( xnodes = that[ '_xnodes' ] ) && ( l = xnodes.length ) ) {\r
for( ; l; ){\r
next = X_Node__commitUpdate( xnodes[ --l ], elm, next, accumulatedFlags );\r
};\r
parentElement.insertBefore( elm, nextElement ) :\r
parentElement.appendChild( elm );\r
\r
- if( X_UA[ 'Gecko' ] && that._tag === 'IFRAME' && elm.contentWindow ){\r
+ if( X_UA[ 'Gecko' ] && that[ '_tag' ] === 'IFRAME' && elm.contentWindow ){\r
// tree に追加されるまで contentWindow は存在しない。\r
elm.contentWindow.location.replace = elm.src;\r
};\r
}) :\r
X_UA_DOM.IE4 ? \r
( function( that, parentElement, prevElement, accumulatedFlags ){\r
- var elm = that._rawObject || X_Node__ie4getRawNode( that ),\r
+ var elm = that[ '_rawObject' ] || X_Node__ie4getRawNode( that ),\r
xnodes, l, i, dirty, mix, html, text, prev;\r
\r
- if( !that._tag ){\r
- that._flags & X_Node_State.DIRTY_CONTENT && X_Node__updateRawNode( that, elm );\r
+ if( !that[ '_tag' ] ){\r
+ that[ '_flags' ] & X_Node_State.DIRTY_CONTENT && X_Node__updateRawNode( that, elm );\r
return elm;\r
};\r
\r
// 4. style="display:none" の場合\r
- if( that._flags & X_Node_State.STYLE_IS_DISPLAY_NONE ){\r
+ if( that[ '_flags' ] & X_Node_State.STYLE_IS_DISPLAY_NONE ){\r
if( elm ){\r
elm.style.display = 'none';\r
if( elm.style.display !== 'none' ){ // ie4 の style は currentStyle 相当らしい、、、? div 以外への display:none が効かないので remove する。\r
prevElement.insertAdjacentHTML( 'AfterEnd', X_Node__actualCreate( that, false ) ) :\r
parentElement.insertAdjacentHTML( 'AfterBegin', X_Node__actualCreate( that, false ) );\r
X_Node__afterActualCreate( that );\r
- return that._rawObject || X_Node__ie4getRawNode( that );\r
+ return that[ '_rawObject' ] || X_Node__ie4getRawNode( that );\r
};\r
\r
- accumulatedFlags |= that._flags;\r
+ accumulatedFlags |= that[ '_flags' ];\r
\r
- xnodes = that._xnodes;\r
+ xnodes = that[ '_xnodes' ];\r
l = xnodes ? xnodes.length : 0;\r
- dirty = !!( that._flags & X_Node_State.IE4_DIRTY_CHILDREN );\r
+ dirty = !!( that[ '_flags' ] & X_Node_State.IE4_DIRTY_CHILDREN );\r
\r
/*\r
* HTML の下に TextNode だけ 。MIX_FIXED でない場合、削除、追加 を親に通知\r
* HTML の下は MIX_FIXED -> TextNode を <font> に置き換えてあるのでW3C DON 的に触ることができる\r
*/\r
if( dirty ){\r
- that._flags &= ~X_Node_State.IE4_DIRTY_CHILDREN;\r
+ that[ '_flags' ] &= ~X_Node_State.IE4_DIRTY_CHILDREN;\r
for( i = 0; i < l; ++i ){\r
- if( xnodes[ i ]._tag ){\r
- that._flags |= X_Node_State.IE4_HAS_ELEMENT;\r
+ if( xnodes[ i ][ '_tag' ] ){\r
+ that[ '_flags' ] |= X_Node_State.IE4_HAS_ELEMENT;\r
} else {\r
- that._flags |= X_Node_State.IE4_HAS_TEXTNODE;\r
+ that[ '_flags' ] |= X_Node_State.IE4_HAS_TEXTNODE;\r
};\r
- if( that._flags & X_Node_BitMask_IE4_IS_MIX === X_Node_BitMask_IE4_IS_MIX ){\r
+ if( that[ '_flags' ] & X_Node_BitMask_IE4_IS_MIX === X_Node_BitMask_IE4_IS_MIX ){\r
mix = true;\r
break;\r
};\r
};\r
};\r
\r
- if( that._flags & X_Node_State.IE4_FIXED || that._flags & X_Node_BitMask_IE4_IS_MIX === X_Node_State.IE4_HAS_ELEMENT ){\r
+ if( that[ '_flags' ] & X_Node_State.IE4_FIXED || that[ '_flags' ] & X_Node_BitMask_IE4_IS_MIX === X_Node_State.IE4_HAS_ELEMENT ){\r
for( i = 0; i < l; ++i ){\r
prev = X_Node__commitUpdate( xnodes[ i ], elm, prev, accumulatedFlags );\r
};\r
for( i = 0; i < l; ++i ){\r
X_Node__afterActualCreate( xnodes[ i ] );\r
};\r
- that._flags |= X_Node_State.IE4_FIXED;\r
+ that[ '_flags' ] |= X_Node_State.IE4_FIXED;\r
} else\r
- if( that._flags & X_Node_State.IE4_HAS_TEXTNODE ){\r
+ if( that[ '_flags' ] & X_Node_State.IE4_HAS_TEXTNODE ){\r
dirty = dirty || false;\r
for( i = 0; i < l; ++i ){\r
text = xnodes[ i ];\r
- if( text._flags & X_Node_BitMask_IS_DIRTY ){\r
- text._flags &= X_Node_BitMask_RESET_DIRTY;\r
+ if( text[ '_flags' ] & X_Node_BitMask_IS_DIRTY ){\r
+ text[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
dirty = true;\r
};\r
};\r
- if( dirty ) elm.innerHTML = that.text();\r
+ if( dirty ) elm.innerHTML = that[ 'text' ]();\r
};\r
\r
- if( accumulatedFlags & X_Node_BitMask_IS_DIRTY ) delete that._fontSize;\r
+ if( accumulatedFlags & X_Node_BitMask_IS_DIRTY ) delete that[ '_fontSize' ];\r
\r
- that._flags &= ~X_Node_State.DIRTY_POSITION;\r
- that._flags & X_Node_BitMask_IS_DIRTY && X_Node__updateRawNode( that, elm );\r
+ that[ '_flags' ] &= ~X_Node_State.DIRTY_POSITION;\r
+ that[ '_flags' ] & X_Node_BitMask_IS_DIRTY && X_Node__updateRawNode( that, elm );\r
return elm;\r
}) :\r
(function(){});\r
var attrs, rename, k, v;\r
\r
// textNode\r
- if( !that._tag ){\r
- elm.data = X_String_chrReferanceTo( that._text );\r
- that._flags &= X_Node_BitMask_RESET_DIRTY;\r
+ if( !that[ '_tag' ] ){\r
+ elm.data = X_String_chrReferanceTo( that[ '_text' ] );\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
return;\r
};\r
// id\r
- if( that._flags & X_Node_State.DIRTY_ID ){\r
- that._id ? ( elm.id = that._id ) : ( elm.id && elm.removeAttribute( 'id' ) ); \r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_ID ){\r
+ that[ '_id' ] ? ( elm.id = that[ '_id' ] ) : ( elm.id && elm.removeAttribute( 'id' ) ); \r
};\r
// className\r
- if( that._flags & X_Node_State.DIRTY_CLASSNAME ){\r
- that._className ? ( elm.className = that._className ) : ( elm.className && elm.removeAttribute( X_UA[ 'IE' ] < 8 ? 'className' : 'class' ) ); // className は ie7- \r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_CLASSNAME ){\r
+ that[ '_className' ] ? ( elm.className = that[ '_className' ] ) : ( elm.className && elm.removeAttribute( X_UA[ 'IE' ] < 8 ? 'className' : 'class' ) ); // className は ie7- \r
};\r
\r
// attr\r
- if( that._flags & X_Node_State.DIRTY_ATTR && ( attrs = that._newAttrs || that._attrs ) ){\r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_ATTR && ( attrs = that[ '_newAttrs' ] || that[ '_attrs' ] ) ){\r
rename = X_Node_Attr_renameForDOM;\r
\r
for( k in attrs ){\r
v = attrs[ k ];\r
\r
- switch( that._tag + k ){\r
+ switch( that[ '_tag' ] + k ){\r
case 'TEXTAREAvalue' :\r
// IETester 5.5 ではエラーが出なかった．MultipulIE5.5 ではエラーが出たので\r
if( !X_UA[ 'MacIE' ] && X_UA[ 'IE5x' ] ){\r
elm.removeAttribute( rename[ k ] || k ) :\r
( elm[ rename[ k ] || k ] = X_Node_Attr_noValue[ k ] ? k : v );\r
};\r
- delete that._newAttrs;\r
+ delete that[ '_newAttrs' ];\r
};\r
\r
// style\r
- if( that._flags & X_Node_State.DIRTY_CSS ){\r
- if( that._flags & X_Node_State.OLD_CSSTEXT ? X_Node_CSS_objToCssText( that ) : that._cssText ){\r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_CSS ){\r
+ if( that[ '_flags' ] & X_Node_State.OLD_CSSTEXT ? X_Node_CSS_objToCssText( that ) : that[ '_cssText' ] ){\r
X_UA[ 'Opera78' ] || X_UA[ 'NN6' ] ?\r
- elm.setAttribute( 'style', that._cssText ) : // opera8用\r
- ( elm.style.cssText = that._cssText );\r
+ elm.setAttribute( 'style', that[ '_cssText' ] ) : // opera8用\r
+ ( elm.style.cssText = that[ '_cssText' ] );\r
} else {\r
elm.style.cssText = ''; // IE5.5以下 Safari3.2 で必要\r
elm.removeAttribute( 'style' );\r
};\r
} else\r
- if( that._flags & X_Node_State.DIRTY_IE_FILTER ){\r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_IE_FILTER ){\r
v = X_Node_CSS_objToIEFilterText( that );\r
if( v ){\r
elm.style.filter = v;\r
- that._flags |= X_Node_State.IE_FILTER_NOW;\r
+ that[ '_flags' ] |= X_Node_State.IE_FILTER_NOW;\r
} else {\r
elm.style.removeAttribute( 'filter' );\r
- that._flags &= ~X_Node_State.IE_FILTER_NOW;\r
+ that[ '_flags' ] &= ~X_Node_State.IE_FILTER_NOW;\r
};\r
};\r
\r
- that._flags &= X_Node_BitMask_RESET_DIRTY;\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
}) :\r
X_UA_DOM.IE4 ? \r
( function( that, elm ){\r
var attrs, rename, k, v;\r
\r
// fake textNode\r
- if( !that._tag ){\r
- elm.innerText = that._text;\r
- that._flags &= X_Node_BitMask_RESET_DIRTY;\r
+ if( !that[ '_tag' ] ){\r
+ elm.innerText = that[ '_text' ];\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
return;\r
};\r
\r
* title、className、id、lang、language には setAttribute でなく、element.id で直接読み書きできる\r
*/ \r
// id\r
- if( that._flags & X_Node_State.DIRTY_ID ) elm.setAttribute( 'id', that._id || ( 'ie4uid' + that._uid ) );\r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_ID ) elm.setAttribute( 'id', that[ '_id' ] || ( 'ie4uid' + that[ '_uid' ] ) );\r
\r
// className\r
- if( that._flags & X_Node_State.DIRTY_CLASSNAME ){\r
- that._className ? ( elm.className = that._className ) : elm.removeAttribute( 'class' );\r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_CLASSNAME ){\r
+ that[ '_className' ] ? ( elm.className = that[ '_className' ] ) : elm.removeAttribute( 'class' );\r
};\r
// style\r
- if( that._flags & X_Node_State.DIRTY_CSS ){\r
- if( that._flags & X_Node_State.OLD_CSSTEXT ? X_Node_CSS_objToCssText( that ) : that._cssText ){\r
- elm.style.cssText = that._cssText;\r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_CSS ){\r
+ if( that[ '_flags' ] & X_Node_State.OLD_CSSTEXT ? X_Node_CSS_objToCssText( that ) : that[ '_cssText' ] ){\r
+ elm.style.cssText = that[ '_cssText' ];\r
} else {\r
elm.style.cssText = '';\r
elm.removeAttribute( 'style' );\r
};\r
} else\r
- if( that._flags & X_Node_State.DIRTY_IE_FILTER ){\r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_IE_FILTER ){\r
v = X_Node_CSS_objToIEFilterText( that );\r
if( v ){\r
elm.style.filter = v;\r
- that._flags |= X_Node_State.IE_FILTER_NOW;\r
+ that[ '_flags' ] |= X_Node_State.IE_FILTER_NOW;\r
} else {\r
elm.style.removeAttribute( 'filter' );\r
- that._flags &= ~X_Node_State.IE_FILTER_NOW;\r
+ that[ '_flags' ] &= ~X_Node_State.IE_FILTER_NOW;\r
};\r
};\r
\r
// attr\r
- if( that._flags & X_Node_State.DIRTY_ATTR && ( attrs = that._newAttrs || that._attrs ) ){\r
+ if( that[ '_flags' ] & X_Node_State.DIRTY_ATTR && ( attrs = that[ '_newAttrs' ] || that[ '_attrs' ] ) ){\r
rename = X_Node_Attr_renameForDOM;\r
for( k in attrs ){\r
//if( X_EMPTY_OBJECT[ k ] ) continue;\r
elm.removeAttribute( rename[ k ] || k ) :\r
elm.setAttribute( rename[ k ] || k, X_Node_Attr_noValue[ k ] ? k : v );\r
};\r
- delete that._newAttrs;\r
+ delete that[ '_newAttrs' ];\r
};\r
\r
- that._flags &= X_Node_BitMask_RESET_DIRTY;\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
}) :\r
(function(){});\r
\r
*/\r
var X_Node__actualCreate =\r
X_UA_DOM.IE4 && (function( that, isChild ){\r
- var uid = that._uid,\r
+ var uid = that[ '_uid' ],\r
html, xnodes, n, i, l;\r
\r
- if( !that._tag ){\r
- html = [ '<FONT id=ie4uid', uid, ' UID="', uid, '">', that._text, '</FONT>' ];// fake textNode\r
- delete that._rawObject;\r
+ if( !that[ '_tag' ] ){\r
+ html = [ '<FONT id=ie4uid', uid, ' UID="', uid, '">', that[ '_text' ], '</FONT>' ];// fake textNode\r
+ delete that[ '_rawObject' ];\r
} else {\r
if( !isChild ) X_Node__actualRemove( that, /* true */ false );\r
\r
- that._flags & X_Node_State.OLD_CSSTEXT && X_Node_CSS_objToCssText( that, true );\r
+ that[ '_flags' ] & X_Node_State.OLD_CSSTEXT && X_Node_CSS_objToCssText( that, true );\r
\r
html = [\r
- '<', that._tag, ' id=', ( that._id || ( 'ie4uid' + uid ) ), ' UID="', uid, '"',\r
- that._className ? ' class="' + that._className + '"' : '',\r
+ '<', that[ '_tag' ], ' id=', ( that[ '_id' ] || ( 'ie4uid' + uid ) ), ' UID="', uid, '"',\r
+ that[ '_className' ] ? ' class="' + that[ '_className' ] + '"' : '',\r
X_Node_Attr_objToAttrText( that, true ),\r
- that._cssText ? ' style="' + that._cssText + '"' : '',\r
+ that[ '_cssText' ] ? ' style="' + that[ '_cssText' ] + '"' : '',\r
'>' ];\r
\r
n = html.length;\r
- if( ( xnodes = that._xnodes ) && ( l = xnodes.length ) ){\r
+ if( ( xnodes = that[ '_xnodes' ] ) && ( l = xnodes.length ) ){\r
\r
- that._flags &= ~X_Node_State.IE4_DIRTY_CHILDREN;\r
+ that[ '_flags' ] &= ~X_Node_State.IE4_DIRTY_CHILDREN;\r
for( i = 0; i < l; ++i ){\r
- if( xnodes[ i ]._tag ){\r
- that._flags |= X_Node_State.IE4_HAS_ELEMENT;\r
+ if( xnodes[ i ][ '_tag' ] ){\r
+ that[ '_flags' ] |= X_Node_State.IE4_HAS_ELEMENT;\r
} else {\r
- that._flags |= X_Node_State.IE4_HAS_TEXTNODE;\r
+ that[ '_flags' ] |= X_Node_State.IE4_HAS_TEXTNODE;\r
};\r
- if( that._flags & X_Node_BitMask_IE4_IS_MIX === X_Node_BitMask_IE4_IS_MIX ){\r
+ if( that[ '_flags' ] & X_Node_BitMask_IE4_IS_MIX === X_Node_BitMask_IE4_IS_MIX ){\r
break;\r
};\r
};\r
\r
- if( that._flags & X_Node_BitMask_IE4_IS_MIX === X_Node_State.IE4_HAS_TEXTNODE ){\r
+ if( that[ '_flags' ] & X_Node_BitMask_IE4_IS_MIX === X_Node_State.IE4_HAS_TEXTNODE ){\r
// only textnode\r
- html[ n ] = that.text();\r
+ html[ n ] = that[ 'text' ]();\r
++n;\r
} else {\r
for( i = 0; i < l; ++i ){\r
html[ n ] = X_Node__actualCreate( xnodes[ i ], true );\r
++n;\r
};\r
- that._flags |= X_Node_State.IE4_FIXED;\r
+ that[ '_flags' ] |= X_Node_State.IE4_FIXED;\r
};\r
};\r
- X_Dom_DTD_EMPTY[ that._tag ] || ( html[ n ] = '<\/' + that._tag + '>' );\r
+ X_Dom_DTD_EMPTY[ that[ '_tag' ] ] || ( html[ n ] = '<\/' + that[ '_tag' ] + '>' );\r
\r
- that._newAttrs && ( that._flags |= X_Node_State.DIRTY_ATTR );\r
+ that[ '_newAttrs' ] && ( that[ '_flags' ] |= X_Node_State.DIRTY_ATTR );\r
};\r
\r
return html.join( '' );\r
X_UA_DOM.IE4 && (function( that ){\r
var xnodes, i, v;\r
\r
- if( !that._tag ) return that;\r
+ if( !that[ '_tag' ] ) return that;\r
\r
- if( ( xnodes = that._xnodes ) && ( i = xnodes.length ) ){\r
+ if( ( xnodes = that[ '_xnodes' ] ) && ( i = xnodes.length ) ){\r
for( ; i; ){\r
X_Node__afterActualCreate( xnodes[ --i ] );\r
};\r
};\r
// ネットワーク系属性と filter は要素生成後に適用\r
- if( that._flags & ( X_Node_State.DIRTY_ATTR | X_Node_State.DIRTY_IE_FILTER ) ){\r
- X_Node__updateRawNode( that, that._rawObject || X_Node__ie4getRawNode( that ) );\r
+ if( that[ '_flags' ] & ( X_Node_State.DIRTY_ATTR | X_Node_State.DIRTY_IE_FILTER ) ){\r
+ X_Node__updateRawNode( that, that[ '_rawObject' ] || X_Node__ie4getRawNode( that ) );\r
} else {\r
- that._flags &= X_Node_BitMask_RESET_DIRTY;\r
+ that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;\r
};\r
X_EventDispatcher_toggleAllEvents( that, true );// イベントの復帰\r
});\r
// GPUレイヤーにいるうちは remove しない。-> GPU解除してから remove する\r
// Firefox34 では遭遇せず、Safari で何度かアニメーションしているうちに発生\r
( function( that, isChild ){\r
- var xnodes = that._xnodes,\r
- elm = that._rawObject,\r
+ var xnodes = that[ '_xnodes' ],\r
+ elm = that[ '_rawObject' ],\r
child, i, l;\r
\r
if( xnodes && ( l = xnodes.length ) ){\r
for( i = 0; i < l; ++i ){\r
child = xnodes[ i ];\r
- child._tag && X_Node__actualRemove( child, true );\r
+ child[ '_tag' ] && X_Node__actualRemove( child, true );\r
};\r
};\r
\r
if( !elm ) return;\r
\r
- if( that._flags & X_Node_State.ACTUAL_LISTENING ){\r
+ if( that[ '_flags' ] & X_Node_State.ACTUAL_LISTENING ){\r
that._listeners && X_EventDispatcher_toggleAllEvents( that, false );// イベントの退避\r
- that._flags &= ~X_Node_State.ACTUAL_LISTENING;\r
+ that[ '_flags' ] &= ~X_Node_State.ACTUAL_LISTENING;\r
};\r
\r
// ie5では filter の効いている要素をremove時に破棄して、再度append 時に新規生成する\r
if( elm.filters && elm.filters.length ){\r
//elm.style.removeAttribute( 'filter' );\r
isChild = false;\r
- delete that._rawObject;\r
+ delete that[ '_rawObject' ];\r
// 破棄前にインタラクティブな属性値を控える\r
- if( X_Node_Attr_HAS_VALUE[ that._tag ] && ( !that._newAttrs || !X_Object_inObject( 'value', that._newAttrs ) ) ){\r
- if( !that._attrs ) that._attrs = {};\r
- that._attrs.value = elm.value;\r
+ if( X_Node_Attr_HAS_VALUE[ that[ '_tag' ] ] && ( !that[ '_newAttrs' ] || !X_Object_inObject( 'value', that[ '_newAttrs' ] ) ) ){\r
+ if( !that[ '_attrs' ] ) that[ '_attrs' ] = {};\r
+ that[ '_attrs' ].value = elm.value;\r
};\r
- if( that._tag === 'OPTION' && ( !that._newAttrs || !X_Object_inObject( 'selected', that._newAttrs ) ) ){\r
- if( !that._attrs ) that._attrs = {};\r
- that._attrs.selected = elm.selected;\r
+ if( that[ '_tag' ] === 'OPTION' && ( !that[ '_newAttrs' ] || !X_Object_inObject( 'selected', that[ '_newAttrs' ] ) ) ){\r
+ if( !that[ '_attrs' ] ) that[ '_attrs' ] = {};\r
+ that[ '_attrs' ].selected = elm.selected;\r
};\r
- if( that._tag === 'SELECT' && ( !that._newAttrs || !X_Object_inObject( 'selectedIndex', that._newAttrs ) ) ){\r
- if( !that._attrs ) that._attrs = {};\r
- that._attrs.selectedIndex = elm.selectedIndex;\r
+ if( that[ '_tag' ] === 'SELECT' && ( !that[ '_newAttrs' ] || !X_Object_inObject( 'selectedIndex', that[ '_newAttrs' ] ) ) ){\r
+ if( !that[ '_attrs' ] ) that[ '_attrs' ] = {};\r
+ that[ '_attrs' ].selectedIndex = elm.selectedIndex;\r
};\r
- if( that._tag === 'INPUT' && that._attr && ( that._attr.type === 'checkbox' || that._attr.type === 'radio' ) && ( !that._newAttrs || !X_Object_inObject( 'checked', that._newAttrs ) ) ){\r
- that._attrs.checked = elm.checked;\r
+ if( that[ '_tag' ] === 'INPUT' && that._attr && ( that._attr.type === 'checkbox' || that._attr.type === 'radio' ) && ( !that[ '_newAttrs' ] || !X_Object_inObject( 'checked', that[ '_newAttrs' ] ) ) ){\r
+ that[ '_attrs' ].checked = elm.checked;\r
};\r
// 子要素への参照を外す\r
elm.innerHTML = '';\r
}) :\r
X_UA_DOM.IE4 ?\r
( function( that, isChild ){\r
- var xnodes = that._xnodes,\r
- elm = that._rawObject || X_Node__ie4getRawNode( that ),\r
+ var xnodes = that[ '_xnodes' ],\r
+ elm = that[ '_rawObject' ] || X_Node__ie4getRawNode( that ),\r
i, l, xnode;\r
if( xnodes && ( l = xnodes.length ) ){\r
for( i = 0; i < l; ++i ){\r
that._listeners && X_EventDispatcher_toggleAllEvents( that, false );// イベントの退避\r
\r
// 破棄前にインタラクティブな属性値を控える\r
- if( X_Node_Attr_HAS_VALUE[ that._tag ] && ( !that._newAttrs || !X_Object_inObject( 'value', that._newAttrs ) ) ){\r
- if( !that._attrs ) that._attrs = {};\r
- that._attrs.value = elm.value;\r
+ if( X_Node_Attr_HAS_VALUE[ that[ '_tag' ] ] && ( !that[ '_newAttrs' ] || !X_Object_inObject( 'value', that[ '_newAttrs' ] ) ) ){\r
+ if( !that[ '_attrs' ] ) that[ '_attrs' ] = {};\r
+ that[ '_attrs' ].value = elm.value;\r
};\r
- if( that._tag === 'OPTION' && ( !that._newAttrs || !X_Object_inObject( 'selected', that._newAttrs ) ) ){\r
- if( !that._attrs ) that._attrs = {};\r
- that._attrs.selected = elm.selected;\r
+ if( that[ '_tag' ] === 'OPTION' && ( !that[ '_newAttrs' ] || !X_Object_inObject( 'selected', that[ '_newAttrs' ] ) ) ){\r
+ if( !that[ '_attrs' ] ) that[ '_attrs' ] = {};\r
+ that[ '_attrs' ].selected = elm.selected;\r
};\r
- if( that._tag === 'SELECT' && ( !that._newAttrs || !X_Object_inObject( 'selectedIndex', that._newAttrs ) ) ){\r
- if( !that._attrs ) that._attrs = {};\r
- that._attrs.selectedIndex = elm.selectedIndex;\r
+ if( that[ '_tag' ] === 'SELECT' && ( !that[ '_newAttrs' ] || !X_Object_inObject( 'selectedIndex', that[ '_newAttrs' ] ) ) ){\r
+ if( !that[ '_attrs' ] ) that[ '_attrs' ] = {};\r
+ that[ '_attrs' ].selectedIndex = elm.selectedIndex;\r
};\r
- if( that._tag === 'INPUT' && that._attr && ( that._attr.type === 'checkbox' || that._attr.type === 'radio' ) && ( !that._newAttrs || !X_Object_inObject( 'checked', that._newAttrs ) ) ){\r
- if( !that._attrs ) that._attrs = {};\r
- that._attrs.checked = elm.checked;\r
+ if( that[ '_tag' ] === 'INPUT' && that._attr && ( that._attr.type === 'checkbox' || that._attr.type === 'radio' ) && ( !that[ '_newAttrs' ] || !X_Object_inObject( 'checked', that[ '_newAttrs' ] ) ) ){\r
+ if( !that[ '_attrs' ] ) that[ '_attrs' ] = {};\r
+ that[ '_attrs' ].checked = elm.checked;\r
};\r
\r
elm.removeAttribute( 'id' ); // ?\r
- //document.all[ that._id || ( 'ie4uid' + that._uid ) ] = null; // MacIE5 でエラー\r
+ //document.all[ that[ '_id' ] || ( 'ie4uid' + that[ '_uid' ] ) ] = null; // MacIE5 でエラー\r
if( !isChild ) elm.outerHTML = '';\r
- delete that._rawObject;\r
+ delete that[ '_rawObject' ];\r
}) :\r
(function(){});\r
\r
-X_ViewPort.listenOnce( X_Event.UNLOAD, X_Node__actualRemove, [ X_Node_html, true ] );\r
+X_ViewPort[ 'listenOnce' ]( X_EVENT_UNLOAD, X_Node__actualRemove, [ X_Node_html, true ] );\r
\r
OSDN Git Service
