\r
X.Dom._useBuilder = true;\r
\r
+X.Dom._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
+};\r
+\r
+if( X.UA.MacIE ){\r
+\r
+ X.Dom._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
+ if( node.nodeType === 1 ){\r
+ //node.outerHTML = '';\r
+ parent && parent.removeChild( node );\r
+ } else\r
+ if( node.nodeType === 3 ){\r
+ //node.data = '';\r
+ l = X.Dom._removalTextNodes.length;\r
+ if( parent ){\r
+ //!l && X.Timer.once( 0, X.Dom._timer_remove );\r
+ //X.Dom._removalTextNodes[ l ] = node;\r
+ //var str=[],p;\r
+ //for( p in node ){\r
+ // str[str.length] = p;\r
+ //};\r
+ //alert( str.join( ',' ) + parent.innerHTML );\r
+ //node.nodeValue = '';\r
+ //parent.replaceChild( document.createElement( 'span' ), node );\r
+ //var e;\r
+ //var f = document.createDocumentFragment();\r
+ //f.appendChild( e = document.createElement( 'span' ) );\r
+ //f.replaceChild( node, e );\r
+ //e.appendChild( f );\r
+ //parent.appendChild( e = document.createElement( 'span' ) );\r
+ //e.appendChild( node );\r
+ //parent.removeChild( e );\r
+ //node.parentNode = null;\r
+ //document.body.appendChild( node );\r
+ //parent.replaceChild( document.createComment( '' ), node );\r
+ document.body.appendChild( node );\r
+ return;\r
+ if( parent.parentNode !== document.body ){\r
+ var clone = parent.cloneNode( true );\r
+ for( var i = 0, l = parent.childNodes.length; i < l; ++i ){\r
+ if( parent.childNodes[ i ] !== node ){\r
+ clone.removeChild( clone.childNodes[ i ] );\r
+ };\r
+ }; \r
+ //parent.parentNode.insertBefore( clone, parent );\r
+ //parent.parentNode.removeChild( parent );\r
+ parent.parentNode.insertBefore( clone, parent );\r
+ parent.style.display = 'none';\r
+ if( xnode ){\r
+ xnode.parent.parent._rawNode = clone;\r
+ };\r
+ } else {\r
+ // ignore\r
+ };\r
+\r
+ };\r
+ //if( !node.ownerDocument ) alert( 'no owner' );\r
+ } else {\r
+ //node.data = '';\r
+ };\r
+ };\r
+ \r
+ X.Dom._removalTextNodes = [];\r
+ \r
+ X.Dom._timer_remove = function(){\r
+ var nodes = X.Dom._removalTextNodes,\r
+ i = 0, node;\r
+ while( i < 5 && nodes.length ){\r
+ node = nodes.shift();\r
+ if( node.parentNode ){\r
+ //node.parentNode.removeChild( node );\r
+ ++i;\r
+ };\r
+ };\r
+ \r
+ //nodes.length && X.Timer.once( 1000, X.Dom._timer_remove );\r
+ };\r
+ \r
+} else\r
+if( X.UA.Opera7 ){\r
+\r
+ X.Dom._fixed_remove = function( node ){\r
+ if( node.nodeType === 1 || node.nodeType === 3 ){\r
+ node.parentNode && node.parentNode.removeChild( node );\r
+ } else {\r
+ //node.data = '';\r
+ };\r
+ };\r
+};\r
+\r
/* --------------------------------------\r
* 通常のwebページに対して使用する場合、dom ready で dom tree を写し取るために使う．\r
* 完全にワンページアプリで<body/>が空な場合、このコードはビルドに含める必要はない\r
+ * \r
+ * TODO (注4) IE6 の空白に関する“癖”について\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
(function(){\r
var r = Node.root,\r
body = r._rawNode,\r
- i, n = 0,\r
+ copy, i, l, node, html,\r
elmProgress;\r
// TODO\r
// textarea の内容を控えて、消す。xnode tree 構築後に復帰。でないと、html パースでこける\r
- \r
+ //X.UA.MacIE && alert( body.innerHTML );\r
// cleanup tree \r
- (function cleanUpTree( elm, skip, head ){\r
- var moveToHead = 'style,bgsound,area,base,meta'.split( ',' ),\r
- remove = 'script,noscript,noframes,comment,!,noembed,nolayer'.split( ',' ),\r
- noncleanup = 'pre,textarea,code,kbd,samp,xmp,plaintext,listing'.split( ',' ),\r
- nodes = X.copyArray( elm.childNodes ),\r
+ (function/*cleanUpTree*/( elm, skip, head ){\r
+ var nodes = X.copyArray( elm.childNodes ),\r
i = 0,\r
l = nodes.length,\r
node, tag, textNode, content;\r
node = nodes[ i ];\r
switch( node.nodeType ){\r
case 1 :\r
- tag = node.tagName.toLowerCase();\r
- if( moveToHead.indexOf( tag ) !== -1 ){\r
+ tag = node.tagName.toUpperCase();\r
+ if( X.Dom.moveToHead[ tag ] ){\r
head = head || document.getElementsByTagName( 'head' )[ 0 ];\r
head.appendChild( node );\r
continue;\r
} else\r
- if( remove.indexOf( tag ) !== -1 ){\r
+ if( X.Dom._isCleanupTarget( node ) ){\r
elm.removeChild( node );\r
continue;\r
} else {\r
// pre タグ以下はスペースの置換は行わない\r
- node.childNodes && node.childNodes.length && cleanUpTree( node, skip || noncleanup.indexOf( tag ) !== -1, head );\r
+ node.childNodes && node.childNodes.length && /*cleanUpTree*/arguments.callee( node, skip || X.Dom.skipCleanupTagNames[ tag ], head );\r
};\r
textNode = null;\r
break;\r
case 3 :\r
content = skip ? node.data : X.Dom.cleanupWhiteSpace( node.data );\r
- //console.log( 'Delete space ' + node.data.length + ' => ' + content.length );\r
+ //console.log( 'Delete space ' + node.data.length + ' => ' + content.length ); \r
if( !textNode && content !== ' ' && content.length ){\r
node.data = content;\r
textNode = node;\r
// ブロック要素直下のスペースだけは削除？？\r
default :\r
//console.log( 'Remove type: ' + node.nodeType + ' value: ' + node.nodeValue );\r
- elm.removeChild( node );\r
+ if( !X.UA.Opera7 /*&& !X.UA.MacIE */ ){\r
+ elm.removeChild( node );\r
+ } else {\r
+ X.Dom._fixed_remove( node );\r
+ };\r
//++count;\r
};\r
};\r
- })( body );\r
- \r
- // body の属性値の取得\r
+ })( X.UA.MacIE ? ( copy = body.cloneNode( true ) ) : body );\r
\r
+ if( X.UA.MacIE ){\r
+ document.write( html = copy.innerHTML );\r
+ } else {\r
+ // body の属性値の取得\r
+ if( X.UA.IE5678 ){\r
+ html = body.innerHTML.split( X.Dom.CRLF ).join( '' ); // 不要な改行が入る\r
+ } else {\r
+ html = body.innerHTML;\r
+ };\r
+ \r
+ // Nokia s60 Safari\r
+ if( html === 'fastinnerhtml!' ){\r
+ html = '';\r
+ for( i = 0, l = body.childNodes.length; i < l; ++i ){\r
+ node = body.childNodes[ i ];\r
+ html += ( node.outerHTML || node.data );\r
+ };\r
+ }; \r
+ };\r
+ \r
body.appendChild( elmProgress = document.createElement( 'div' ) );\r
elmProgress.style.cssText = 'position:absolute;top:0;left:0;z-index:9999;width:0;height:0.5em;background:#00f;overflow:hidden;';\r
+ elmProgress.setAttribute( 'style', 'position:absolute;top:0;left:0;z-index:9999;width:0;height:0.5em;background:#00f;overflow:hidden;' );\r
\r
- X.Dom.asyncParse( body.innerHTML, true )\r
+ X.Dom.asyncParse( html, true )\r
.listen( X.Event.PROGRESS,\r
function(e){\r
elmProgress.style.width = ( e.progress * 100 | 0 ) + '%';\r
.listenOnce( X.Event.SUCCESS, function( e ){\r
var xnodes = Node.root._xnodes = [], t;\r
xnodes.push.apply( xnodes, e.xnodes );\r
- \r
+ elmProgress.style.width = '100%';\r
+\r
X.Dom._asyncCreateTree( Node.root, body.childNodes, elmProgress );\r
} );\r
\r
(function(){\r
var r = Node.root,\r
body = r._rawNode,\r
- i, n = 0, elmProgress = '_xdom_builder_progress';\r
+ elmProgress = '_xdom_builder_progress',\r
+ html;\r
\r
/*\r
* http://support.microsoft.com/kb/812417/ja\r
* \r
* body.innerHTML でなく、 body.outerHTML にはできなかった、、、\r
*/\r
+ html = body.innerHTML;\r
body.insertAdjacentHTML( 'BeforeEnd', '<div id="' + elmProgress + '" style="position:absolute;top:0;left:0;z-index:9999;width:0;height:0.5em;background:#00f;overflow:hidden;"></div>' );\r
elmProgress = document.all[ elmProgress ];\r
\r
- X.Dom.asyncParse( body.innerHTML, true )\r
+ X.Dom.asyncParse( html, true )\r
.listen( X.Event.PROGRESS,\r
- function(e){\r
+ function( e ){\r
elmProgress.style.width = ( e.progress * 100 | 0 ) + '%';\r
}\r
)\r
function( e ){\r
var xnodes = Node.root._xnodes = [], t;\r
xnodes.push.apply( xnodes, e.xnodes );\r
+ elmProgress.style.width = '100%';\r
\r
X.Dom._asyncCreateTree( Node.root, body.childNodes || body.children, elmProgress );\r
}\r
flag : 0\r
},\r
xnode, i, dive;\r
+ //alert( 'X.Dom._asyncCreateTree' );\r
while( current || ( current = stack.pop() ) ){\r
i = current.i;\r
l = current.l;\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
// progress\r
elmProgress.style.width = ( ( 1 - done / Node._chashe.length ) * 100 | 0 ) + '%';\r
\r
for( ; current.j < m; ++current.j ){\r
elm = elems[ current.j ];\r
- tag = elm.tagName;\r
+ tag = elm.tagName && elm.tagName.toUpperCase();\r
if( ( elm.nodeType !== 1 && elm.nodeType !== 3 ) || tag === '!' || ( tag && tag.charAt( 0 ) === '/' ) ){\r
- elm.parentNode.removeChild( elm );\r
+ if( !X.UA.Opera7 && !X.UA.MacIE ){\r
+ elm.parentNode.removeChild( elm );\r
+ } else {\r
+ X.Dom._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
- // elm.parentNode.removeChild( elm );\r
- // continue;\r
- //};\r
- alert( '[' +parent._tag + '>' +xnode._tag + '] !== ' + elm.nodeType + '\n' + elm.data );\r
+ if( !( text = elm.data ) || ( text = X.Dom.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
+ };\r
+ continue;\r
+ };\r
+ alert( '1:[' +parent._tag + '>' +xnode._tag + '] !== ' + elm.nodeType + '\n' + ( elm.data ) );\r
+ } else\r
+ if( X.Dom.moveToHead[ tag ] ){\r
+ alert( tag );\r
+ continue;\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
+ if( xnode._tag !== tag ){\r
+ alert( '2:[' +parent._tag + '>' +xnode._tag + ' len:' + (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
+ xnode._tag = tag;\r
//};\r
xnode._root = parent._root;\r
elm.UID = xnode._uid;\r
xnode.attr( 'value', xnode.html() ).empty();\r
current.xtext = null;\r
} else\r
- if( !xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag.toLowerCase() ] || tag === 'SCRIPT' || xnode.hasClass( 'cleanup-target' ) ) ){ // ie で body 内の script が2度よばれるのに対処\r
+ if( X.Dom._isCleanupTarget( elm ) ){// !xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){ // ie で body 内の script が2度よばれるのに対処\r
//alert( '[' +parent._tag + '>' + xnode._tag + '] remove ... ' );\r
xnode.destroy();\r
} else\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
+ skipCleanup : skipCleanup || X.Dom.skipCleanupTagNames[ tag ]\r
};\r
};\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
+ 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
};\r
- alert( parent._tag + '>' + '"' + xnode._text + '" !== ' + tag + '\n' + elm.outerHTML );\r
+ alert( parent._tag + ' > ' + '"' + xnode._text + '" !== ' + tag + '\n' +\r
+ 'prev : ' + ( xnode.prevNode() && xnode.prevNode().html() ) + '\n' +\r
+ 'next : ' + ( xnode.nextNode() && xnode.nextNode().html() ) + '\n' +\r
+ 'html : ' + elm.outerHTML );\r
break;\r
};\r
\r
++current.j;\r
xnode._rawNode = elm;\r
+ xnode._text = elm.data; // 正確\r
xnode._root = parent._root;\r
if( !skipCleanup ){\r
if( !( text = xnode._text ) || ( text = X.Dom.cleanupWhiteSpace( text ) ) === ' ' ){\r
xnode._rawNode = elm;\r
xnode._root = parent._root;\r
//xnode._tag = X.Dom.DTD.TAG_FIX[ tag ] || tag;\r
- if( !xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag.toLowerCase() ] || tag === 'SCRIPT' || xnode.hasClass( 'cleanup-target' ) ) ){\r
+ if( X.Dom._isCleanupTarget( elm ) ){ //!xnode.hasClass( 'skip-cleanup' ) && ( X.Dom.cleanupTagNames[ tag ] || xnode.hasClass( 'cleanup-target' ) ) ){\r
xnode.destroy();\r
break;\r
};\r
tag === 'INPUT' && (\r
!xnode._attrs ?\r
( xnode._attrs = { type : 'text' } ) :\r
- !xnode._attrs.type || ( xnode._attrs.type = 'text' )\r
+ xnode._attrs.type || ( xnode._attrs.type = 'text' )\r
);\r
current.flag |= 3;\r
current.xtext = null;\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
+ skipCleanup : skipCleanup || X.Dom.skipCleanupTagNames[ tag ]\r
};\r
};\r
break;\r
// textNode がある\r
( current.flag & 6 ) && ( parent._dirty |= X.Dom.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
OSDN Git Service
