case 0x4 : // start attr filter\r
name1st ?\r
( ( phase = 0x5 ) && ( start = i ) ) :\r
+ chr !== ' ' &&\r
( phase = 0xf );\r
break;\r
case 0x5 : // attr filter key\r
break;\r
case 0xa :\r
chr === ')' && ( phase = 0xe ) && ++i && ( b = parseFloat( query.substring( start, i ) ) || 0 );\r
- console.log( '0xa: ' + start + ' ' + i );\r
+ //console.log( '0xa: ' + start + ' ' + i );\r
break;\r
// contains, lang\r
case 0xb :\r
break;\r
} else {\r
if( a !== a || b !== b ) return i;\r
- result = [ not ? 0 : combinator, selector, name, a, b ];\r
+ result = [ not ? 0 : combinator, SELECTOR[ name ] || selector, name, a, b ];\r
break; \r
};\r
} else {\r
l, i, n, parsed,\r
xnodes, // 一時保存用\r
merge, // 要素がコメントノードで汚染されている場合使う\r
+ parent, children, j, m,\r
combinator, selector, name, tagName,\r
uid, tmp, xnode, filter, key, op, val, toLower, useName,\r
links, className, attr, flag;\r
// > TagName|*\r
case 2 :\r
for( ; i < l; ++i ){\r
- for( xnode = parents[ i ][ 'firstChild' ](); xnode; xnode = xnode[ 'next' ]() ){\r
- if( xnode[ '_tag' ] && ( isAll || tagName === xnode[ '_tag' ] ) ) xnodes[ ++n ] = xnode;\r
- }; \r
+ parent = parents[ i ];\r
+ if( ( children = parent[ '_xnodes' ] ) && ( m = children.length ) ){\r
+ for( j = 0; j < m; ++j ){\r
+ xnode = children[ j ];\r
+ if( xnode[ '_tag' ] && ( isAll || tagName === xnode[ '_tag' ] ) ) xnodes[ ++n ] = xnode;\r
+ };\r
+ }; \r
};\r
break;\r
// + TagName|*\r
case 3 :\r
for( ; i < l; ++i ){\r
+ \r
+ xnode = parents[ i ];\r
+ j = xnode[ 'getOrder' ]() + 1;\r
+ parent = xnode.parent;\r
+ if( parent && ( children = parent[ '_xnodes' ] ) && ( m = children.length ) ){\r
+ for( ; j < m; ++j ){\r
+ xnode = children[ j ];\r
+ if( xnode[ '_tag' ] ){\r
+ if( isAll || tagName === xnode[ '_tag' ] ){\r
+ xnodes[ ++n ] = xnode;\r
+ };\r
+ break;\r
+ };\r
+ };\r
+ };\r
+ /*\r
for( xnode = parents[ i ][ 'next' ](); xnode; xnode = xnode[ 'next' ]() ){\r
if( xnode[ '_tag' ] ){\r
if( isAll || tagName === xnode[ '_tag' ] ) xnodes[ ++n ] = xnode;\r
break;\r
}; \r
- }; \r
+ }; */ \r
};\r
break;\r
// ~ TagName|*\r
\r
// case 6 : 属性ノードは実装しない\r
\r
- default :\r
+ default : \r
if( combinator === 1 || ( isStart && selector < 7 ) ){\r
+ if( isStart ){\r
+ if( tagName === 'HTML' ){\r
+ xnodes[ 0 ] = X_Node_html;\r
+ break;\r
+ };\r
+ if( tagName === 'HEAD' ){\r
+ xnodes[ 0 ] = X_Node_head;\r
+ break;\r
+ };\r
+ if( tagName === 'BODY' ){\r
+ xnodes[ 0 ] = X_Node_body;\r
+ break;\r
+ };\r
+ \r
+ };\r
//console.log( l + ' > ' + xnodes.length + ' tag:' + tagName );\r
+ merge = {};\r
for( ; i < l; ++i ){\r
xnode = parents[ i ];\r
- xnode[ '_xnodes' ] && xnode[ '_xnodes' ].length && X_Node_Selector__fetchElements( xnodes, xnode, isAll ? null : tagName );\r
+ xnode[ '_xnodes' ] && xnode[ '_xnodes' ].length && X_Node_Selector__fetchElements( xnodes, xnode, isAll ? '' : tagName, merge );\r
};\r
//console.log( l + ' >> ' + xnodes.length + ' tag:' + tagName );\r
};\r
case 6 :\r
isNot = true;\r
parsed = parsed[ 2 ];\r
- continue;\r
+ name = parsed[ 2 ];\r
+ switch( parsed[ 1 ] ) {\r
+ case 1 :\r
+ filter = [ 'tag', 1, isXML ? name : name.toUpperCase() ]; break;\r
+ // #, ID\r
+ case 2 :\r
+ filter = [ 'id', 1, name ]; break;\r
+ // ., class\r
+ case 3 :\r
+ filter = [ 'class', 3, name ]; break;\r
+ // :, 擬似クラス\r
+ case 4 :\r
+ if( !( filter = X_Node_Selector__filter[ name ] ) ){\r
+ return [];\r
+ };\r
+ break;\r
+ // [] 属性\r
+ case 5 :\r
+ filter = [ name, parsed[ 3 ], parsed[ 4 ] ]; break;\r
+ };\r
+ break;\r
// scope\r
case 7 :\r
xnodes = scope; break;\r
case 9 :\r
if( links = document.links ){\r
for( xnodes = [], i = links.length; i; ){\r
- xnodes[ --i ] = new Node( links[ i ] );\r
+ xnodes[ --i ] = Node( links[ i ] );\r
};\r
} else {\r
// area[href],a[href]\r
for( i = 0, n = -1, l = xnodes.length; i < l; ++i ){\r
xnode = xnodes[ i ];\r
attr =\r
+ key === 'tag' ? xnode[ '_tag' ] :\r
key === 'id' ? xnode[ '_id' ] :\r
key === 'class' ? xnode[ '_className' ] :\r
xnode[ '_attrs' ] && xnode[ '_attrs' ][ key ];\r
//useName ?\r
// elem[ X_Node_Attr_renameForDOM[ key ] || key ] :\r
// elem.getAttribute( key, 2 );\r
- flag = attr != null;// && ( !useName || attr !== '' );\r
+ flag = !!attr;// && ( !useName || attr !== '' );\r
if( flag && op ){\r
if( toLower ) attr = attr.toLowerCase();\r
\r
xnodes[ ++n ] = xnode;\r
};\r
};\r
- X_Node_Selector__sortElementOrder( ret = [], xnodes, hasRoot ? [ HTML ] : HTML[ '_xnodes' ] );\r
- xnodes = ret;\r
+ xnodes = X_Node_Selector__sortElementOrder( [], xnodes, hasRoot ? [ HTML ] : HTML[ '_xnodes' ] );\r
};\r
\r
return xnodes.length === 1 ? xnodes[ 0 ] : new X_NodeList( xnodes );\r
for( ; i < l; ++i ){\r
child = xnodes[ i ];\r
if( !child[ '_tag' ] ) continue;\r
- //console.log( child[ '_tag' ] );\r
- if( ( j = list.indexOf( child ) ) !== -1 ){\r
+\r
+ j = list.indexOf( child );\r
+ if( j !== -1 ){\r
newList[ newList.length ] = child;\r
- list.splice( j, 1 );\r
- if( list.length === 1 ){\r
- newList[ newList.length ] = list[ 0 ];\r
- list.length = 0;\r
- return true;\r
+ if( list.length === 2 ){\r
+ newList[ newList.length ] = list[ j === 0 ? 1 : 0 ];\r
+ return newList;\r
};\r
- if( list.length === 0 ) return true;\r
+ list.splice( j, 1 );\r
};\r
+\r
if( ( _xnodes = child[ '_xnodes' ] ) && X_Node_Selector__sortElementOrder( newList, list, _xnodes ) ){\r
- return true;\r
+ return newList;\r
};\r
};\r
};\r
\r
- function X_Node_Selector__fetchElements( list, parent, tag ){\r
+ function X_Node_Selector__fetchElements( list, parent, tag, merge ){\r
var xnodes = parent[ '_xnodes' ],\r
l = xnodes.length,\r
i = 0,\r
- child;\r
+ child, uid;\r
for( ; i < l; ++i ){\r
child = xnodes[ i ];\r
- if( child[ '_tag' ] ){\r
+ uid = child[ '_uid' ];\r
+ if( !merge[ uid ] && child[ '_tag' ] ){\r
+ merge[ uid ] = true;\r
( !tag || child[ '_tag' ] === tag ) && ( list[ list.length ] = child );\r
- //console.log( parent[ '_tag' ] + ' > ' + child[ '_tag' ] + ' == ' + tag+ ' l:' + list.length );\r
- child[ '_xnodes' ] && child[ '_xnodes' ].length && X_Node_Selector__fetchElements( list, child, tag );\r
+ child[ '_xnodes' ] && X_Node_Selector__fetchElements( list, child, tag, merge );\r
};\r
};\r
};\r
checked = {};\r
flag_not = flags.not;\r
for( i = 0; link = links[ i ]; ++i ){\r
- checked[ ( new Node( link ) )[ '_uid' ] ] = true;\r
+ checked[ ( Node( link ) )[ '_uid' ] ] = true;\r
};\r
for( i = 0, n = -1; xnode = xnodes[ i ]; ++i ){\r
if( checked[ xnode[ '_uid' ] ] ^ flag_not ) res[ ++n ] = xnode;\r
OSDN Git Service
