// pre タグ以下はスペースの置換は行わない\r
node.childNodes && node.childNodes.length && me( node, skip || noncleanup.indexOf( tag ) !== -1, head );\r
};\r
- textNode = false; \r
+ textNode = null;\r
break;\r
case 3 :\r
content = skip ? node.data : X.Dom.cleanupWhiteSpace( node.data );\r
elmProgress.style.width = ( e.progress * 100 | 0 ) + '%';\r
}\r
)\r
- .listenOnce( X.Event.SUCCESS, function( e ){\r
- var xnodes = Node.root._xnodes = [], t;\r
- xnodes.push.apply( xnodes, e.xnodes );\r
- \r
- X.Dom._asyncCreateTree( Node.root, body.childNodes || body.children, elmProgress );\r
- } );\r
+ .listenOnce( X.Event.SUCCESS,\r
+ function( e ){\r
+ var xnodes = Node.root._xnodes = [], t;\r
+ xnodes.push.apply( xnodes, e.xnodes );\r
+ \r
+ X.Dom._asyncCreateTree( Node.root, body.childNodes || body.children, elmProgress );\r
+ }\r
+ );\r
}) :\r
(function(){\r
\r
}) );\r
\r
X.Dom._asyncCreateTree = function ( parent, elems, elmProgress, async ){\r
- var xnodes = async ? 0 : X.copyArray( parent._xnodes ),\r
- l = async ? 0 : xnodes.length,\r
+ var xnodes = async ? 0 : X.copyArray( parent._xnodes ),\r
+ l = async ? 0 : xnodes.length,\r
+ stack = async ? async.stack : [],\r
+ done = async ? async.done : 0,\r
+ startTime = X.getTime(), \r
current = async ? async.current : {\r
me : parent,\r
xnodes : xnodes,\r
l : l,\r
i : 0,\r
- elems : elems,\r
+ elems : X.copyArray( elems ),\r
j : 0,\r
xtext : null,\r
flag : 0\r
},\r
- stack = async ? async.stack : [],\r
- done = async ? async.done : 0,\r
- startTime = X.getTime(),\r
xnode, i, dive;\r
while( current || ( current = stack.pop() ) ){\r
i = current.i;\r
};\r
\r
bindElementToXnode =\r
-document.getElementById ?\r
-(function( parent, xnode, current ){\r
- var elems = current.elems,\r
- //j = current.j,\r
- m = elems.length,\r
- xtext = current.xtext,\r
- skipCleanup = current.skipCleanup,\r
- elm, tag, text;\r
-\r
- xnode.parent = parent;\r
-\r
- for( ; current.j < m; ++current.j ){\r
- elm = elems[ current.j ];\r
- tag = elm.tagName;\r
- if( ( elm.nodeType !== 1 && elm.nodeType !== 3 ) || tag === '!' || ( tag && tag.charAt( 0 ) === '/' ) ){\r
- elm.parentNode.removeChild( elm );\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
+ document.getElementById ?\r
+ (function( parent, xnode, current ){\r
+ var elems = current.elems,\r
+ //j = current.j,\r
+ m = elems.length,\r
+ xtext = current.xtext,\r
+ skipCleanup = current.skipCleanup,\r
+ inPreTag = current.inPreTag,\r
+ elm, tag, text;\r
+ \r
+ xnode.parent = parent;\r
+ \r
+ for( ; current.j < m; ++current.j ){\r
+ elm = elems[ current.j ];\r
+ tag = elm.tagName;\r
+ if( ( elm.nodeType !== 1 && elm.nodeType !== 3 ) || tag === '!' || ( tag && tag.charAt( 0 ) === '/' ) ){\r
elm.parentNode.removeChild( elm );\r
continue;\r
};\r
- alert( '[' +parent._tag + '>' +xnode._tag + '] !== ' + elm.nodeType + '\n' + elm.data );\r
- } else\r
- if( xnode._tag.toUpperCase() !== tag ){\r
- alert( '[' +parent._tag + '>' +xnode._tag + ' ' + (xnode._xnodes ? xnode._xnodes.length : '' ) + '] !== ' + tag + ' ' + (elm.childNodes ? elm.childNodes.length : '' ) + '\n' + elm.outerHTML );\r
- } else {\r
- xnode._rawNode = elm;\r
- //if( ( doc = elm.ownerDocument || elm.document ) && ( doc.createElement( 'p' ).tagName === doc.createElement( 'P' ).tagName ) ){\r
- if( tag.charAt( 0 ) === '/' ) tag = tag.slice( 1 );\r
- xnode._tag = tag; // .toUpperCase()\r
- //};\r
- xnode._root = parent._root;\r
- elm.UID = xnode._uid;\r
+ \r
+ if( xnode._xnodeType === 1 ){\r
+ if( elm.nodeType === 3 ){\r
+ //if( !( text = elm.data ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+ // elm.parentNode.removeChild( elm );\r
+ // continue;\r
+ //};\r
+ alert( '[' +parent._tag + '>' +xnode._tag + '] !== ' + elm.nodeType + '\n' + elm.data );\r
+ } else\r
+ if( xnode._tag.toUpperCase() !== tag ){\r
+ alert( '[' +parent._tag + '>' +xnode._tag + ' ' + (xnode._xnodes ? xnode._xnodes.length : '' ) + '] !== ' + tag + ' ' + (elm.childNodes ? elm.childNodes.length : '' ) + '\n' + elm.outerHTML );\r
+ } else {\r
+ xnode._rawNode = elm;\r
+ //if( ( doc = elm.ownerDocument || elm.document ) && ( doc.createElement( 'p' ).tagName === doc.createElement( 'P' ).tagName ) ){\r
+ if( tag.charAt( 0 ) === '/' ) tag = tag.slice( 1 );\r
+ xnode._tag = tag; // .toUpperCase()\r
+ //};\r
+ xnode._root = parent._root;\r
+ elm.UID = xnode._uid;\r
+ \r
+ if( tag === 'TEXTAREA' ){\r
+ xnode.attr( 'value', xnode.html() ).empty();\r
+ current.xtext = null;\r
+ } else\r
+ if( 0 <= X.Dom.cleanupTagNames.indexOf( tag.toLowerCase() ) || tag === 'SCRIPT' ){ // ie で body 内の script が2度よばれるのに対処\r
+ //alert( '[' +parent._tag + '>' + xnode._tag + '] remove ... ' );\r
+ xnode.destroy();\r
+ } else\r
+ if( elm.childNodes && elm.childNodes.length ){\r
+ //alert( '[' +parent._tag + '>' + xnode._tag + ' ' + (xnode._xnodes ? xnode._xnodes.length : '' ) + '] === ' + tag + ' ' + (elm.childNodes ? elm.childNodes.length : '' ) + ' Hit\n' + elm.outerHTML );\r
+ current.xtext = null;\r
+ ++current.j;\r
+ \r
+ return {\r
+ me : xnode,\r
+ xnodes : X.copyArray( xnode._xnodes ),\r
+ xtext : null,\r
+ flag : 0,\r
+ i : 0,\r
+ l : xnode._xnodes.length,\r
+ elems : X.copyArray( elm.childNodes ),\r
+ j : 0,\r
+ skipCleanup : skipCleanup || 0 <= X.Dom.skipCleanupTagNames.indexOf( tag.toLowerCase() )\r
+ };\r
+ };\r
+ };\r
+ ++current.j;\r
+ break;\r
+ };\r
+ \r
+ if( elm.nodeType !== 3 ){\r
+ if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+ console.log( '[' +parent._tag + '>' + xnode._uid + '] destroy ... ' );\r
+ xnode.destroy();\r
+ break;\r
+ };\r
+ alert( parent._tag + '>' + '"' + xnode._text + '" !== ' + tag + '\n' + elm.outerHTML );\r
+ break;\r
+ };\r
\r
- if( tag === 'TEXTAREA' ){\r
- xnode.attr( 'value', xnode.html() ).empty();\r
+ ++current.j;\r
+ xnode._rawNode = elm;\r
+ xnode._root = parent._root;\r
+ if( !skipCleanup ){\r
+ if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+ console.log( '[' +parent._tag + '>' + xnode._uid + '] destroy ... ' );\r
+ xnode.destroy();\r
+ };\r
+ if( xtext ){\r
+ xtext.text( xtext._text + text );\r
+ console.log( '[' +parent._tag + '>' + xnode._uid + '] xtext,destroy ... ' );\r
+ xnode.destroy();\r
+ } else {\r
+ //alert( parent._tag + '>' + '"' + text + '"\n' + elm.data );\r
+ xnode.text( text );\r
+ };\r
} else\r
- if( 0 <= X.Dom.cleanupTagNames.indexOf( tag.toLowerCase() ) || tag === 'SCRIPT' ){ // ie で body 内の script が2度よばれるのに対処\r
- //alert( '[' +parent._tag + '>' + xnode._tag + '] remove ... ' );\r
+ if( xtext ){\r
+ xtext.text( xtext._text + xnode._text );\r
+ console.log( '[' +parent._tag + '>' + xnode._uid + '] xtext,destroy ... ' );\r
xnode.destroy();\r
- } else\r
- if( elm.childNodes && elm.childNodes.length ){\r
- //alert( '[' +parent._tag + '>' + xnode._tag + ' ' + (xnode._xnodes ? xnode._xnodes.length : '' ) + '] === ' + tag + ' ' + (elm.childNodes ? elm.childNodes.length : '' ) + ' Hit\n' + elm.outerHTML );\r
- ++current.j;\r
- return {\r
- me : xnode,\r
- xnodes : X.copyArray( xnode._xnodes ),\r
- xtext : null,\r
- flag : 0,\r
- i : 0,\r
- l : xnode._xnodes.length,\r
- elems : elm.childNodes,\r
- j : 0,\r
- skipCleanup : skipCleanup || 0 <= X.Dom.skipCleanupTagNames.indexOf( tag.toLowerCase() )\r
- };\r
};\r
- current.xtext = null;\r
- };\r
- ++current.j;\r
- break;\r
- };\r
- \r
- if( elm.nodeType !== 3 ){\r
- if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
- console.log( '[' +parent._tag + '>' + xnode._uid + '] destroy ... ' );\r
- xnode.destroy();\r
+ current.xtext = xtext || xnode;\r
break;\r
};\r
- alert( parent._tag + '>' + '"' + xnode._text + '" !== ' + tag + '\n' + elm.outerHTML );\r
- break;\r
- };\r
+ }) :\r
+ (function ( parent, xnode, current ){\r
+ var elems = current.elems,\r
+ j = current.j,\r
+ m = elems.length,\r
+ xtext = current.xtext,\r
+ skipCleanup = current.skipCleanup,\r
+ elm, tag, text;\r
\r
- ++current.j;\r
- xnode._rawNode = elm;\r
- xnode._root = parent._root;\r
- if( !skipCleanup ){\r
- if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
- console.log( '[' +parent._tag + '>' + xnode._uid + '] destroy ... ' );\r
- xnode.destroy();\r
- };\r
- if( xtext ){\r
- xtext.text( xtext._text + text );\r
- console.log( '[' +parent._tag + '>' + xnode._uid + '] xtext,destroy ... ' );\r
- xnode.destroy();\r
- } else {\r
- //alert( parent._tag + '>' + '"' + text + '"\n' + elm.data );\r
- xnode.text( text );\r
- };\r
- } else\r
- if( xtext ){\r
- xtext.text( xtext._text + xnode._text );\r
- console.log( '[' +parent._tag + '>' + xnode._uid + '] xtext,destroy ... ' );\r
- xnode.destroy();\r
- };\r
- current.xtext = xtext || xnode;\r
- break;\r
- };\r
-}) :\r
-(function ( parent, xnode, current ){\r
- var elems = current.elems,\r
- j = current.j,\r
- m = elems.length,\r
- xtext = current.xtext,\r
- skipCleanup = current.skipCleanup,\r
- elm, tag, text;\r
-\r
- xnode.parent = parent;\r
- \r
- if( xnode._xnodeType === 3 ){\r
- //alert( X.Dom.cleanupWhiteSpace( xnode._text ) );\r
- if( !skipCleanup ){\r
- if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
- xnode.destroy();\r
- } else\r
- if( xtext ){\r
- //alert( 'xtext ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
- xtext.text( xtext._text + text );\r
- xnode.destroy();\r
- } else {\r
- //alert( 'xnode ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
- xnode.text( text );\r
- };\r
- } else\r
- if( xtext ){\r
- //alert( 'skip ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
- xtext.text( xtext._text + xnode._text );\r
- xnode.destroy();\r
- };\r
- current.flag |= 4;\r
- current.xtext = xtext || xnode;\r
- return;\r
- };\r
- \r
- if( xnode._xnodeType !== 1 ){\r
- //alert( xnode._xnodeType )\r
- return;\r
- };\r
- \r
- for( ; j < m; ++j, ++current.j ){\r
- elm = elems[ j ];\r
- tag = elm.tagName;\r
- /*\r
- * 未知のタグについては、閉じタグも含めてタグ名扱いになる\r
- */\r
- if( tag === '!' || tag.charAt( 0 ) === '/' ){\r
- //alert( '## ' + tag );\r
- continue;\r
- } else\r
- if( xnode._tag !== tag ){\r
- alert( xnode._tag + ' ' + ' !== ' + tag + '\nxnode.html():' + xnode.attr('cite') + '\nelm.outerHTML:' + elm.outerHTML );\r
- } else {\r
- ++current.j;\r
+ xnode.parent = parent;\r
\r
- xnode._rawNode = elm;\r
- xnode._root = parent._root;\r
- //xnode._tag = X.Dom.DTD.TAG_FIX[ tag ] || tag;\r
- if( 0 <= X.Dom.cleanupTagNames.indexOf( tag.toLowerCase() ) || tag === 'SCRIPT' ){\r
- xnode.destroy();\r
- break;\r
+ if( xnode._xnodeType === 3 ){\r
+ //alert( X.Dom.cleanupWhiteSpace( xnode._text ) );\r
+ if( !skipCleanup ){\r
+ if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
+ xnode.destroy();\r
+ } else\r
+ if( xtext ){\r
+ //alert( 'xtext ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
+ xtext.text( xtext._text + text );\r
+ xnode.destroy();\r
+ } else {\r
+ //alert( 'xnode ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
+ xnode.text( text );\r
+ };\r
+ } else\r
+ if( xtext ){\r
+ //alert( 'skip ' + text.charCodeAt( 0 ) + ' : ' + text.length );\r
+ xtext.text( xtext._text + xnode._text );\r
+ xnode.destroy();\r
+ };\r
+ current.flag |= 4;\r
+ current.xtext = xtext || xnode;\r
+ return;\r
};\r
\r
- !xnode._id && elm.setAttribute( 'id', 'ie4uid' + xnode._uid );\r
- elm.setAttribute( 'UID', xnode._uid );\r
- \r
- tag === 'INPUT' && (\r
- !xnode._attrs ?\r
- ( xnode._attrs = { type : 'text' } ) :\r
- !xnode._attrs.type || ( xnode._attrs.type = 'text' )\r
- );\r
- current.flag |= 3;\r
- current.xtext = null;\r
+ if( xnode._xnodeType !== 1 ){\r
+ //alert( xnode._xnodeType )\r
+ return;\r
+ };\r
\r
- if( tag === 'TEXTAREA' ){\r
- xnode.attr( 'value', xnode.html() ).empty();\r
- } else\r
- if( xnode._xnodes && xnode._xnodes.length ){\r
- return {\r
- me : xnode,\r
- xnodes : X.copyArray( xnode._xnodes ),\r
- xtext : null,\r
- flag : 0,\r
- i : 0,\r
- l : xnode._xnodes.length,\r
- elems : elm.children,\r
- j : 0,\r
- skipCleanup : skipCleanup || 0 <= X.Dom.skipCleanupTagNames.indexOf( tag.toLowerCase() )\r
+ for( ; j < m; ++j, ++current.j ){\r
+ elm = elems[ j ];\r
+ tag = elm.tagName;\r
+ /*\r
+ * 未知のタグについては、閉じタグも含めてタグ名扱いになる\r
+ */\r
+ if( tag === '!' || tag.charAt( 0 ) === '/' ){\r
+ //alert( '## ' + tag );\r
+ continue;\r
+ } else\r
+ if( xnode._tag !== tag ){\r
+ alert( xnode._tag + ' ' + ' !== ' + tag + '\nxnode.html():' + xnode.attr('cite') + '\nelm.outerHTML:' + elm.outerHTML );\r
+ } else {\r
+ ++current.j;\r
+ \r
+ xnode._rawNode = elm;\r
+ xnode._root = parent._root;\r
+ //xnode._tag = X.Dom.DTD.TAG_FIX[ tag ] || tag;\r
+ if( 0 <= X.Dom.cleanupTagNames.indexOf( tag.toLowerCase() ) || tag === 'SCRIPT' ){\r
+ xnode.destroy();\r
+ break;\r
+ };\r
+ \r
+ !xnode._id && elm.setAttribute( 'id', 'ie4uid' + xnode._uid );\r
+ elm.setAttribute( 'UID', xnode._uid );\r
+ \r
+ tag === 'INPUT' && (\r
+ !xnode._attrs ?\r
+ ( xnode._attrs = { type : 'text' } ) :\r
+ !xnode._attrs.type || ( xnode._attrs.type = 'text' )\r
+ );\r
+ current.flag |= 3;\r
+ current.xtext = null;\r
+ \r
+ if( tag === 'TEXTAREA' ){\r
+ xnode.attr( 'value', xnode.html() ).empty();\r
+ } else\r
+ if( xnode._xnodes && xnode._xnodes.length ){\r
+ return {\r
+ me : xnode,\r
+ xnodes : X.copyArray( xnode._xnodes ),\r
+ xtext : null,\r
+ flag : 0,\r
+ i : 0,\r
+ l : xnode._xnodes.length,\r
+ elems : X.copyArray( elm.children ),\r
+ j : 0,\r
+ skipCleanup : skipCleanup || 0 <= X.Dom.skipCleanupTagNames.indexOf( tag.toLowerCase() )\r
+ };\r
+ };\r
+ break;\r
};\r
};\r
- break;\r
- };\r
- };\r
- // for\r
- if( !xnode._rawNode ){\r
- alert( xnode._tag + ' ' + xnode._id + ' !== none...' );\r
- };\r
-\r
- // textNode がある\r
- ( current.flag & 6 ) && ( parent._dirty |= X.Dom.Dirty.IE4_TEXTNODE_FIX );\r
-});\r
+ // for\r
+ if( !xnode._rawNode ){\r
+ alert( xnode._tag + ' ' + xnode._id + ' !== none...' );\r
+ };\r
+ \r
+ // textNode がある\r
+ ( current.flag & 6 ) && ( parent._dirty |= X.Dom.Dirty.IE4_TEXTNODE_FIX );\r
+ });\r
OSDN Git Service
