\r
-X.Dom._useBuilder = true;\r
+X_TEMP.X_Dom_useBuilder = true;\r
\r
-X.Dom._isCleanupTarget = function( elm ){\r
+X_TEMP._isCleanupTarget = function( elm ){\r
var cname = ' ' + elm.className + ' ',\r
tag = ( elm.tagName || '' ).toUpperCase();\r
return cname.indexOf( ' skip-cleanup ' ) === -1 &&\r
- ( X.Dom.cleanupTagNames[ tag ] || cname.indexOf( ' cleanup-target ' ) !== -1 );\r
+ ( X_Dom_DTD_CLEANUP_TAGS[ tag ] || cname.indexOf( ' cleanup-target ' ) !== -1 );\r
};\r
\r
if( X.UA.MacIE ){\r
\r
- X.Dom._fixed_remove = function( node, xnode ){\r
+ X_TEMP._fixed_remove = function( node, xnode ){\r
var parent = node.parentNode, l;\r
\r
node.nodeType !== 3 && alert( node.nodeType + '\n' + ( node.outerHTML || node.data ) );\r
} else\r
if( X.UA.Opera7 ){\r
\r
- X.Dom._fixed_remove = function( node ){\r
+ X_TEMP._fixed_remove = function( node ){\r
if( node.nodeType === 1 || node.nodeType === 3 ){\r
node.parentNode && node.parentNode.removeChild( node );\r
- } else {\r
+ //} else {\r
//node.data = '';\r
};\r
};\r
* http://kojs.sukobuto.com/docs/visible-binding\r
* IE6 には、「空の span エレメントに続く空白は無視される」という謎な癖があります。 \r
*/\r
-X.Dom.listenOnce( X.Dom.Event.DOM_PRE_INIT,\r
- X.Dom.DOM_W3C ?\r
+X.Dom.listenOnce( X_TEMP.SYSTEM_EVENT_PRE_INIT,\r
+ X_UA_DOM.W3C ?\r
(function(){\r
var r = Node._body,\r
body = r._rawObject,\r
//X.UA.MacIE && alert( body.innerHTML );\r
// cleanup tree \r
(function/*cleanUpTree*/( elm, skip, head ){\r
- var nodes = X.copyArray( elm.childNodes ),\r
+ var nodes = X_Object_cloneArray( elm.childNodes ),\r
i = 0,\r
l = nodes.length,\r
node, tag, textNode, content;\r
switch( node.nodeType ){\r
case 1 :\r
tag = node.tagName.toUpperCase();\r
- if( X.Dom.moveToHead[ tag ] ){\r
+ if( X_Dom_DTD_MOVE_TO_HEAD[ tag ] ){\r
head = head || document.getElementsByTagName( 'head' )[ 0 ];\r
head.appendChild( node );\r
continue;\r
} else\r
- if( X.Dom._isCleanupTarget( node ) ){\r
+ if( X_TEMP._isCleanupTarget( node ) ){\r
elm.removeChild( node );\r
continue;\r
} else {\r
// pre タグ以下はスペースの置換は行わない\r
- node.childNodes && node.childNodes.length && /*cleanUpTree*/arguments.callee( node, skip || X.Dom.skipCleanupTagNames[ tag ], head );\r
+ node.childNodes && node.childNodes.length && /*cleanUpTree*/arguments.callee( node, skip || X_Dom_DTD_SKIP_CLEANUP_TAGS[ tag ], head );\r
};\r
textNode = null;\r
break;\r
case 3 :\r
- content = skip ? node.data : X.Dom.cleanupWhiteSpace( node.data );\r
+ content = skip ? node.data : X_String_cleanupWhiteSpace( node.data );\r
//console.log( 'Delete space ' + node.data.length + ' => ' + content.length ); \r
if( !textNode && content !== ' ' && content.length ){\r
node.data = content;\r
if( !X.UA.Opera7 /*&& !X.UA.MacIE */ ){\r
elm.removeChild( node );\r
} else {\r
- X.Dom._fixed_remove( node );\r
+ X_TEMP._fixed_remove( node );\r
};\r
//++count;\r
};\r
} else {\r
// body の属性値の取得\r
if( X.UA.IE5678 ){\r
- html = body.innerHTML.split( X.Dom.CRLF ).join( '' ); // 不要な改行が入る\r
+ html = body.innerHTML.split( X_String_CRLF ).join( '' ); // 不要な改行が入る\r
} else {\r
html = body.innerHTML;\r
};\r
xnodes.push.apply( xnodes, e.xnodes );\r
elmProgress.style.width = '100%';\r
\r
- X.Dom._asyncCreateTree( Node._body, body.childNodes, elmProgress );\r
+ X_TEMP.asyncCreateTree( Node._body, body.childNodes, elmProgress );\r
} );\r
\r
}) :\r
-X.Dom.DOM_IE4 ?\r
+X_UA_DOM.IE4 ?\r
(function(){\r
var r = Node._body,\r
body = r._rawObject,\r
xnodes.push.apply( xnodes, e.xnodes );\r
elmProgress.style.width = '100%';\r
\r
- X.Dom._asyncCreateTree( Node._body, body.childNodes || body.children, elmProgress );\r
+ X_TEMP.asyncCreateTree( Node._body, body.childNodes || body.children, elmProgress );\r
}\r
);\r
}) :\r
\r
}) );\r
\r
-X.Dom._asyncCreateTree = function ( parent, elems, elmProgress, async ){\r
- var xnodes = async ? 0 : X.copyArray( parent._xnodes ),\r
+X_TEMP.asyncCreateTree = function ( parent, elems, elmProgress, async ){\r
+ var xnodes = async ? 0 : X_Object_cloneArray( parent._xnodes ),\r
l = async ? 0 : xnodes.length,\r
stack = async ? async.stack : [],\r
done = async ? async.done : 0,\r
- startTime = X.getTime(), \r
+ startTime = X_Timer_now(), \r
current = async ? async.current : {\r
me : parent,\r
xnodes : xnodes,\r
l : l,\r
i : 0,\r
- elems : X.copyArray( elems ),\r
+ elems : X_Object_cloneArray( elems ),\r
j : 0,\r
xtext : null,\r
flag : 0\r
},\r
xnode, i, dive;\r
- //alert( 'X.Dom._asyncCreateTree' );\r
+ //alert( 'X_TEMP.asyncCreateTree' );\r
while( current || ( current = stack.pop() ) ){\r
i = current.i;\r
l = current.l;\r
xnodes = current.xnodes;\r
while( xnode = xnodes[ i ] ){ \r
//\r
- dive = X.Dom._bindElementToXnode( parent, xnode, current );\r
+ dive = X_TEMP.bindElementToXnode( parent, xnode, current );\r
\r
++i;\r
++done;\r
continue;\r
};\r
\r
- if( startTime + 16 <= X.getTime() ){\r
+ if( startTime + 16 <= X_Timer_now() ){\r
current.i = i;\r
if( async ){\r
async.current = i < l && current;\r
async.done = done;\r
};\r
//alert( 'koko?' );\r
- X.Timer.once( 0, X.Dom._asyncCreateTree, [ null, null, elmProgress, async || { stack : stack, current : i < l && current, done : done } ] );\r
+ X.Timer.once( 0, X_TEMP.asyncCreateTree, [ null, null, elmProgress, async || { stack : stack, current : i < l && current, done : done } ] );\r
// progress\r
elmProgress.style.width = ( ( 1 - done / Node._chashe.length ) * 100 | 0 ) + '%';\r
return;\r
current = null;\r
};\r
// complete\r
- X.Dom.asyncDispatch( 0, { type : X.Dom.Event.DOM_BUILDER_COMPLETE } );\r
+ X.Dom.asyncDispatch( 0, X_TEMP.SYSTEM_EVENT_XTREE );\r
elmProgress.parentNode ? elmProgress.parentNode.removeChild( elmProgress ) : ( elmProgress.outerHTML = '' );\r
- delete X.Dom._asyncCreateTree;\r
- delete X.Dom._bindElementToXnode;\r
+ delete X_TEMP.asyncCreateTree;\r
+ delete X_TEMP.bindElementToXnode;\r
+ delete X_TEMP.X_Dom_useBuilder;\r
};\r
\r
-X.Dom._bindElementToXnode =\r
- X.Dom.DOM_W3C ?\r
+X_TEMP.bindElementToXnode =\r
+ X_UA_DOM.W3C ?\r
(function( parent, xnode, current ){\r
var elems = current.elems,\r
//j = current.j,\r
if( !X.UA.Opera7 && !X.UA.MacIE ){\r
elm.parentNode.removeChild( elm );\r
} else {\r
- X.Dom._fixed_remove( elm );\r
+ X_TEMP._fixed_remove( elm );\r
};\r
continue;\r
};\r
\r
if( xnode._xnodeType === 1 ){\r
if( elm.nodeType === 3 ){\r
- if( !( text = elm.data ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+ if( !( text = elm.data ) || ( text = X_String_cleanupWhiteSpace( text ) ) === ' ' ){\r
//alert( text.charCodeAt( 0 ) );\r
if( !X.UA.Opera7 && !X.UA.MacIE ){\r
elm.parentNode.removeChild( elm );\r
} else {\r
- X.Dom._fixed_remove( elm );\r
+ X_TEMP._fixed_remove( elm );\r
};\r
continue;\r
};\r
alert( '1:[' +parent._tag + '>' +xnode._tag + '] !== ' + elm.nodeType + '\n' + ( elm.data ) );\r
} else\r
- if( X.Dom.moveToHead[ tag ] ){\r
+ if( X_Dom_DTD_MOVE_TO_HEAD[ tag ] ){\r
alert( tag );\r
continue;\r
} else\r
xnode.attr( 'value', xnode.html() ).empty();\r
\r
} else\r
- //if( X.Dom._isCleanupTarget( elm ) ){// !xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){ // ie で body 内の script が2度よばれるのに対処\r
+ //if( X_TEMP._isCleanupTarget( elm ) ){// !xnode.hasClass( 'skip-cleanup' ) && ( X_Dom_DTD_CLEANUP_TAGS[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){ // ie で body 内の script が2度よばれるのに対処\r
//alert( '[' +parent._tag + '>' + xnode._tag + '] remove ... ' );\r
//xnode.destroy();\r
//} else\r
\r
return {\r
me : xnode,\r
- xnodes : X.copyArray( xnode._xnodes ),\r
+ xnodes : X_Object_cloneArray( xnode._xnodes ),\r
xtext : null,\r
flag : 0,\r
i : 0,\r
l : xnode._xnodes.length,\r
- elems : X.copyArray( elm.childNodes ),\r
+ elems : X_Object_cloneArray( elm.childNodes ),\r
j : 0,\r
- skipCleanup : skipCleanup || X.Dom.skipCleanupTagNames[ tag ]\r
+ skipCleanup : skipCleanup || X_Dom_DTD_SKIP_CLEANUP_TAGS[ tag ]\r
};\r
};\r
// nochild\r
};\r
\r
if( elm.nodeType !== 3 ){\r
- if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+ if( !( text = xnode._text ) || ( text = X_String_cleanupWhiteSpace( text ) ) === ' ' ){\r
console.log( '[' +parent._tag + '> UID:' + xnode._uid + ' len:' + xnode._text.length + ' code : ' + xnode._text.charCodeAt( 0 ) + ',' + xnode._text.charCodeAt( 1 ) + '] destroyed.' );\r
xnode.destroy();\r
break;\r
xnode._text = elm.data; // 正確\r
xnode._root = parent._root;\r
if( !skipCleanup ){\r
- if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+ if( !( text = xnode._text ) || ( text = X_String_cleanupWhiteSpace( text ) ) === ' ' ){\r
console.log( '[' +parent._tag + '>' + xnode._uid + '] destroy ... ' );\r
xnode.destroy();\r
};\r
xnode.parent = parent;\r
\r
if( xnode._xnodeType === 3 ){\r
- //alert( X.Dom.cleanupWhiteSpace( xnode._text ) );\r
+ //alert( X_String_cleanupWhiteSpace( xnode._text ) );\r
if( !skipCleanup ){\r
- if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+ if( !( text = xnode._text ) || ( text = X_String_cleanupWhiteSpace( text ) ) === ' ' ){\r
xnode.destroy();\r
} else\r
if( xtext ){\r
xnode._rawObject = elm;\r
xnode._dirty = 0;\r
xnode._root = parent._root;\r
- //xnode._tag = X.Dom.DTD.TAG_FIX[ tag ] || tag;\r
- if( X.Dom._isCleanupTarget( elm ) ){ //!xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){\r
+ //xnode._tag = X_Dom_DTD_TAG_FIX[ tag ] || tag;\r
+ if( X_TEMP._isCleanupTarget( elm ) ){ //!xnode.hasClass( 'skip-cleanup' ) && ( X_Dom_DTD_CLEANUP_TAGS[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){\r
xnode.destroy();\r
break;\r
};\r
if( xnode._xnodes && xnode._xnodes.length ){\r
return {\r
me : xnode,\r
- xnodes : X.copyArray( xnode._xnodes ),\r
+ xnodes : X_Object_cloneArray( xnode._xnodes ),\r
xtext : null,\r
flag : 0,\r
i : 0,\r
l : xnode._xnodes.length,\r
- elems : X.copyArray( elm.children ),\r
+ elems : X_Object_cloneArray( elm.children ),\r
j : 0,\r
- skipCleanup : skipCleanup || X.Dom.skipCleanupTagNames[ tag ]\r
+ skipCleanup : skipCleanup || X_Dom_DTD_SKIP_CLEANUP_TAGS[ tag ]\r
};\r
};\r
break;\r
};\r
\r
// textNode がある\r
- ( current.flag & 6 ) && ( parent._dirty |= X.Dom.Dirty.IE4_TEXTNODE_FIX );\r
+ ( current.flag & 6 ) && ( parent._dirty |= X_Node_Dirty.IE4_TEXTNODE_FIX );\r
});\r
\r
console.log( 'X.Dom.Builder' );\r
-console.log( 'bootTime : ' + ( X.getTime() - X.bootTime ) );
\ No newline at end of file
+console.log( 'bootTime : ' + ( X_Timer_now() - X.bootTime ) );
\ No newline at end of file
OSDN Git Service
