OSDN Git Service

Version 0.6.135, fix for closure compiler.
[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 08_XNodeSelector.js
index 2e065e8..1268ac3 100644 (file)
@@ -7,22 +7,22 @@
  * http://standards.mitsue.co.jp/resources/w3c/TR/css3-selectors/#nth-child-pseudo\r
  */\r
 \r
-X.Dom.Query = {\r
-       _PSEUDO    : {\r
+var\r
+       X_Node_Selector__PSEUDO = {\r
                'nth-child'        : 9,\r
                'nth-last-child'   : 14,\r
                'nth-of-type'      : 11,\r
                'nth-last-of-type' : 16,\r
-               root               : 4,\r
-               link               : 4,\r
-               lang               : 4,\r
-               empty              : 5,\r
-               target             : 6,\r
-               invalid            : 7,\r
-               enabled            : 7,\r
-               checked            : 7,\r
-               disabled           : 8,\r
-               contains           : 8,\r
+               'root'             : 4,\r
+               'link'             : 4,\r
+               'lang'             : 4,\r
+               'empty'            : 5,\r
+               'target'           : 6,\r
+               'invalid'          : 7,\r
+               'enabled'          : 7,\r
+               'checked'          : 7,\r
+               'disabled'         : 8,\r
+               'contains'         : 8,\r
                'last-child'       : 10,\r
                'only-child'       : 10,                        \r
                'first-child'      : 11,\r
@@ -31,7 +31,7 @@ X.Dom.Query = {
                'first-of-type'    : 13\r
        },\r
        \r
-       _COMBINATOR : {\r
+       X_Node_Selector__COMBINATOR = {\r
                ''    : 0, // none\r
                ' '   : 1, // 子孫セレクタ\r
                '>'   : 2, // 子セレクタ\r
@@ -40,36 +40,38 @@ X.Dom.Query = {
                ','   : 5,\r
                '@'   : 6  // XML 用の拡張、属性ノードを辿る http://www.marguerite.jp/Nihongo/WWW/RefDOM/_Attr_interface.html\r
        },\r
-       _SELECTOR : {\r
-               ''    : 0, // none\r
-               tag   : 1,\r
-               '#'   : 2,\r
-               '.'   : 3,\r
-               ':'   : 4,\r
-               '['   : 5,\r
-               not   : 6,\r
-               scope : 7,\r
-               root  : 8,\r
-               link  : 9\r
+       X_Node_Selector__SELECTOR = {\r
+               ''      : 0, // none\r
+               'tag'   : 1,\r
+               '#'     : 2,\r
+               '.'     : 3,\r
+               ':'     : 4,\r
+               '['     : 5,\r
+               'not'   : 6,\r
+               'scope' : 7,\r
+               'root'  : 8,\r
+               'link'  : 9\r
        },\r
-       _OPERATORS : { '==' : 1, '!=': 2, '~=': 3, '^=': 4, '$=': 5, '*=': 6, '|=': 7 }, // '':0 は属性が存在するならtrue\r
+       X_Node_Selector__OPERATORS = { '==' : 1, '!=': 2, '~=': 3, '^=': 4, '$=': 5, '*=': 6, '|=': 7 }, // '':0 は属性が存在するならtrue\r
        // TODO { a : 1, A : 2, _ : 3,,, }\r
-       _ALPHABET  : 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-0123456789\\',\r
-       _NUMBER    : '+-0123456789'\r
-};\r
-                       \r
+       X_Node_Selector__ALPHABET  = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-0123456789\\',\r
+       X_Node_Selector__NUMBER    = '+-0123456789';\r
+\r
+// XMLWrapper のために今だけ外部に公開\r
+X_NodeSelector_parse = X_Node_Selector__parse;\r
+               \r
 /*\r
  * セレクタ文字列の解析、但し一挙に行わず、ひと塊づつ\r
  * 結合子 + 単体セレクタ( タグ,*,#,.,[],: )\r
  * ' ' 子孫セレクタ, '>' 直下,'+','~' の場合、tagName|* を返す\r
  * return [ 今回のパースで解析した終端位置, [ selector, ... ] ] error: return pointer\r
  */\r
-X.Dom.Query._parse = function( query, last ){\r
-       var COMBINATOR = X.Dom.Query._COMBINATOR,\r
-               SELECTOR   = X.Dom.Query._SELECTOR,\r
-               OPERATORS  = X.Dom.Query._OPERATORS,\r
-               ALPHABET   = X.Dom.Query._ALPHABET,\r
-               NUMBER     = X.Dom.Query._NUMBER,\r
+function X_Node_Selector__parse( query, last ){\r
+       var COMBINATOR = X_Node_Selector__COMBINATOR,\r
+               SELECTOR   = X_Node_Selector__SELECTOR,\r
+               OPERATORS  = X_Node_Selector__OPERATORS,\r
+               ALPHABET   = X_Node_Selector__ALPHABET,\r
+               NUMBER     = X_Node_Selector__NUMBER,\r
                result     = [],\r
                i          = -1,\r
                l          = query.length,\r
@@ -182,16 +184,22 @@ X.Dom.Query._parse = function( query, last ){
                                break;\r
                        default :\r
                };\r
+               \r
+               if( phase === 0xf ) return i;\r
+               \r
                //alert( chr + ' ' + phase + ' ' + selector + ' ' + name + ' ' + name1st )\r
                if( phase === 0xe ){\r
                        if( selector === 4 ){// :not\r
                                if( name === 'not' ){\r
-                                       if( not ) return i; // error\r
-                                       not      = true;\r
-                                       selector = 0;\r
-                                       phase    = 0x0;\r
-                                       name     = null;\r
-                                       continue;\r
+                                       if( not ){\r
+                                               return i; // error\r
+                                       } else {\r
+                                               not      = true;\r
+                                               selector = 0;\r
+                                               phase    = 0x0;\r
+                                               name     = null;                                        \r
+                                       };\r
+                                       //continue;\r
                                } else\r
                                if( name === 'lang' || name === 'contains' ){\r
                                        result = [ not ? 0 : combinator, selector, name, value ];\r
@@ -201,16 +209,16 @@ X.Dom.Query._parse = function( query, last ){
                                        result = [ not ? 0 : combinator, selector, name, a, b ];\r
                                        break;  \r
                                };\r
+                       } else {\r
+                               result =\r
+                                       combinator === 5 ?\r
+                                               5 :\r
+                                       selector === 5 ?\r
+                                               [ not ? 0 : combinator, selector, key, operator, value ] :\r
+                                               [ not ? 0 : combinator, selector, name.split( '\\' ).join( '' ) ];\r
+                               break;                          \r
                        };\r
-                       result =\r
-                               combinator === 5 ?\r
-                                       5 :\r
-                               selector === 5 ?\r
-                                       [ not ? 0 : combinator, selector, key, operator, value ] :\r
-                                       [ not ? 0 : combinator, selector, name.split( '\\' ).join( '' ) ];\r
-                       break;\r
-               } else\r
-               if( phase === 0xf ) return i;\r
+               };\r
 \r
                escape = chr === '\\' && !escape;\r
        };\r
@@ -220,16 +228,16 @@ X.Dom.Query._parse = function( query, last ){
 };\r
 \r
        // セレクター\r
-       X.Dom.find = X._shortcut = Node.prototype.find = X.Dom.NodeList.prototype.find = function( queryString ){\r
-               var HTML      = Node._html,\r
-                       scope     = this.constructor === X.Dom.NodeList && this.length ? this : [ this.constructor === Node ? this : Node._body ],\r
+       X[ 'Doc' ][ 'find' ] = X_shortcutFunction = Node.prototype[ 'find' ] = X_NodeList.prototype[ 'find' ] = function ( queryString ){\r
+               var HTML      = X_Node_html,\r
+                       scope     = this.constructor === X_NodeList && this.length ? this : [ this.constructor === Node ? this : X_Node_body ],\r
                        parents   = scope, // 探索元の親要素 XNodeList の場合あり\r
                        // TODO { title : true,,, }\r
                        noLower   = 'title id name class for action archive background cite classid codebase data href longdesc profile src usemap',// + X_Dom_DTD_ATTR_VAL_IS_URI.join( ' ' ),\r
                        ARY_PUSH  = Array.prototype.push,\r
                        ret       = [], // 結果要素\r
-                       root      = X.Dom.Node.getRoot( scope[ 0 ] ),\r
-                       isXML     = !!X.Dom.Node.isXmlDocument( root ),\r
+                       root      = X_Node_getRoot( scope[ 0 ] ),\r
+                       isXML     = !!X_Node_isXmlDocument( root ),\r
                        isMulti   = 1 < scope.length,// 要素をマージする必要がある\r
                        isStart   = true,\r
                        _         = ' ',\r
@@ -242,8 +250,8 @@ X.Dom.Query._parse = function( query, last ){
             links, className, attr, flag;\r
 \r
                /*@+debug[*/\r
-               if( X_ViewPort_readyState < X.Event.XDOM_READY ){\r
-                       alert( 'not ready! use X.ViewPort.listenOnce( X.Event.XDOM_READY, callback )' );\r
+               if( X_ViewPort_readyState < X_EVENT_XDOM_READY ){\r
+                       alert( 'not ready! use X.ViewPort.listenOnce( X_EVENT_XDOM_READY, callback )' );\r
                        return;\r
                };\r
                /*]@+debug*/\r
@@ -259,7 +267,7 @@ X.Dom.Query._parse = function( query, last ){
                        \r
                        // 初期化処理\r
                        if( !parsed ){\r
-                               parsed = X.Dom.Query._parse( queryString );\r
+                               parsed = X_Node_Selector__parse( queryString );\r
                                \r
                                if( typeof parsed === 'number' ){\r
                                        // error\r
@@ -269,7 +277,7 @@ X.Dom.Query._parse = function( query, last ){
                                queryString = queryString.substr( parsed[ 0 ] );\r
                                parsed      = parsed[ 1 ];\r
                                \r
-                               //console.log( 'X.Dom.Query._parse ' + parsed );\r
+                               //console.log( 'X_Node_Selector__parse ' + parsed );\r
                                \r
                                if( parsed === 5 ){\r
                                        isMulti = true;\r
@@ -311,17 +319,17 @@ X.Dom.Query._parse = function( query, last ){
                                // > TagName|*\r
                                case 2 :\r
                                        for( ; i < l; ++i ){\r
-                                               for( xnode = parents[ i ].firstChild(); xnode; xnode = xnode.nextNode() ){\r
-                                                       if( xnode._xnodeType === 1 && ( isAll || tagName === xnode._tag ) ) xnodes[ ++n ] = xnode;\r
+                                               for( xnode = parents[ i ][ 'firstChild' ](); xnode; xnode = xnode[ 'next' ]() ){\r
+                                                       if( xnode[ '_tag' ] && ( isAll || tagName === xnode[ '_tag' ] ) ) xnodes[ ++n ] = xnode;\r
                                                };                              \r
                                        };\r
                                        break;\r
                                // + TagName|*\r
                                case 3 :\r
                                        for( ; i < l; ++i ){\r
-                                               for( xnode = parents[ i ].nextNode(); xnode; xnode = xnode.nextNode() ){\r
-                                                       if( xnode._xnodeType === 1 ){\r
-                                                               if( isAll || tagName === xnode._tag ) xnodes[ ++n ] = xnode;\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
@@ -331,9 +339,9 @@ X.Dom.Query._parse = function( query, last ){
                                case 4 :\r
                                        merge  = {};\r
                                        for( ; i < l; ++i ){\r
-                                               for( xnode = parents[ i ].nextNode(); xnode; xnode = xnode.nextNode() ){\r
-                                                       if( xnode._xnodeType === 1 && ( isAll || tagName === xnode._tag ) ){\r
-                                                               uid = xnode._uid;\r
+                                               for( xnode = parents[ i ][ 'next' ](); xnode; xnode = xnode[ 'next' ]() ){\r
+                                                       if( xnode[ '_tag' ] && ( isAll || tagName === xnode[ '_tag' ] ) ){\r
+                                                               uid = xnode[ '_uid' ];\r
                                                                if( merge[ uid ] ){\r
                                                                        break;\r
                                                                } else {\r
@@ -352,7 +360,7 @@ X.Dom.Query._parse = function( query, last ){
                                                //console.log( l + ' > ' + xnodes.length + ' tag:' + tagName );\r
                                                for( ; i < l; ++i ){\r
                                                        xnode = parents[ i ];\r
-                                                       xnode._xnodes && xnode._xnodes.length && X.Dom.Query._fetchElements( xnodes, xnode, isAll ? null : tagName );\r
+                                                       xnode[ '_xnodes' ] && xnode[ '_xnodes' ].length && X_Node_Selector__fetchElements( xnodes, xnode, isAll ? null : tagName );\r
                                                };\r
                                                //console.log( l + ' >> ' + xnodes.length + ' tag:' + tagName );\r
                                        };\r
@@ -371,7 +379,7 @@ X.Dom.Query._parse = function( query, last ){
                                        filter = [ 'class', 3 /*'~='*/, name ]; break;\r
                                // :, 擬似クラス\r
                                case 4 :\r
-                                       if( !( filter = X.Dom.Query._filter[ name ] ) ){\r
+                                       if( !( filter = X_Node_Selector__filter[ name ] ) ){\r
                                                return [];\r
                                        };\r
                                        break;\r
@@ -427,13 +435,13 @@ X.Dom.Query._parse = function( query, last ){
                                        op  = filter[ 1 ];\r
                                        val = filter[ 2 ];\r
                                        \r
-                                       key = X_Node_Attr.renameForTag[ key ] || key;\r
+                                       key = X_Node_Attr_renameForTag[ key ] || key;\r
                                        \r
                                        // [class~='val']\r
                                        if( !isXML && key === 'class' && op === 3 ){\r
                                                val = _ + val + _;\r
                                                for( i = 0, n = -1; xnode = xnodes[ i ]; ++i ){\r
-                                                       className = xnode._className;\r
+                                                       className = xnode[ '_className' ];\r
                                                        if( !!( className && ( _ + className + _ ).indexOf( val ) > -1 ) ^ isNot ) tmp[ ++n ] = xnode;\r
                                                };\r
                                        } else {\r
@@ -441,7 +449,7 @@ X.Dom.Query._parse = function( query, last ){
                                                // 諦めて、funcAttrを呼ぶ\r
                                                // flag_call  = ($.browser.safari && key === 'selected');\r
                                                // getAttributeを使わない\r
-                                               useName = X.UA.IE && key !== 'href' && key !== 'src';\r
+                                               useName = X_UA[ 'IE' ] && key !== 'href' && key !== 'src';\r
                                                toLower = !!val && !isXML && noLower.indexOf( key ) === -1; //!noLower.test(key);\r
                                                if( toLower ) val = val.toLowerCase();\r
                                                if( op === 3 ) val = _ + val + _;\r
@@ -449,13 +457,13 @@ X.Dom.Query._parse = function( query, last ){
                                                for( i = 0, n = -1, l = xnodes.length; i < l; ++i ){\r
                                                        xnode = xnodes[ i ];\r
                                                        attr =\r
-                                                               key === 'id' ? xnode._id :\r
-                                                               key === 'class' ? xnode._className :\r
-                                                               xnode._attrs && xnode._attrs[ key ];\r
+                                                               key === 'id' ? xnode[ '_id' ] :\r
+                                                               key === 'class' ? xnode[ '_className' ] :\r
+                                                               xnode[ '_attrs' ] && xnode[ '_attrs' ][ key ];\r
                                                                //flag_call ?\r
                                                                //      funcAttr( elem, key ) :\r
                                                                //useName ?\r
-                                                               //      elem[ X_Node_Attr.renameForDOM[ key ] || key ] :\r
+                                                               //      elem[ X_Node_Attr_renameForDOM[ key ] || key ] :\r
                                                                //      elem.getAttribute( key, 2 );\r
                                                        flag = attr != null;// && ( !useName || attr !== '' );\r
                                                        if( flag && op ){\r
@@ -503,33 +511,33 @@ X.Dom.Query._parse = function( query, last ){
                if( isMulti ){\r
                        xnodes && xnodes.length && ARY_PUSH.apply( ret, xnodes );\r
                        l = ret.length;\r
-                       if( l < 2 ) return ret[ 0 ] || Node.none;\r
+                       if( l < 2 ) return ret[ 0 ] || X_Node_none;\r
                        \r
                        xnodes = [];\r
                        merge  = {};\r
                        for( i = 0, n = -1; i < l; ++i ){\r
                                //alert( 'multi:' + i )\r
                                xnode = ret[ i ];\r
-                               if( !merge[ uid = xnode._uid ] ){\r
+                               if( !merge[ uid = xnode[ '_uid' ] ] ){\r
                                        merge[ uid ] = true;\r
                                        xnodes[ ++n ] = xnode;\r
                                };\r
                        };\r
-                       X.Dom.Query._sortElementOrder( ret = [], xnodes, hasRoot ? [ HTML ] : HTML._xnodes );\r
+                       X_Node_Selector__sortElementOrder( ret = [], xnodes, hasRoot ? [ HTML ] : HTML[ '_xnodes' ] );\r
                        xnodes = ret;\r
                };\r
 \r
-               return xnodes.length === 1 ? xnodes[ 0 ] : new X.Dom.NodeList( xnodes );\r
+               return xnodes.length === 1 ? xnodes[ 0 ] : new X_NodeList( xnodes );\r
        };\r
        \r
-       X.Dom.Query._sortElementOrder = function( newList, list, xnodes ){\r
+       function X_Node_Selector__sortElementOrder( newList, list, xnodes ){\r
                var l = xnodes.length,\r
                        i = 0,\r
                        j, child, _xnodes;\r
                for( ; i < l; ++i ){\r
                        child = xnodes[ i ];\r
-                       if( child._xnodeType !== 1 ) continue;\r
-                       //console.log( child._tag );\r
+                       if( !child[ '_tag' ] ) continue;\r
+                       //console.log( child[ '_tag' ] );\r
                        if( ( j = list.indexOf( child ) ) !== -1 ){\r
                                newList[ newList.length ] = child;\r
                                list.splice( j, 1 );\r
@@ -540,46 +548,46 @@ X.Dom.Query._parse = function( query, last ){
                                };\r
                                if( list.length === 0 ) return true;\r
                        };\r
-                       if( ( _xnodes = child._xnodes ) && X.Dom.Query._sortElementOrder( newList, list, _xnodes ) ){\r
+                       if( ( _xnodes = child[ '_xnodes' ] ) && X_Node_Selector__sortElementOrder( newList, list, _xnodes ) ){\r
                                return true;\r
                        };\r
                };\r
        };\r
        \r
-       X.Dom.Query._fetchElements = function( list, parent, tag ){\r
-               var xnodes = parent._xnodes,\r
+       function X_Node_Selector__fetchElements( list, parent, tag ){\r
+               var xnodes = parent[ '_xnodes' ],\r
                        l      = xnodes.length,\r
                        i      = 0,\r
                        child;\r
                for( ; i < l; ++i ){\r
                        child = xnodes[ i ];\r
-                       if( child._xnodeType === 1 ){\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.Dom.Query._fetchElements( list, child, tag );\r
+                       if( child[ '_tag' ] ){\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
                        };\r
                };\r
        };\r
 \r
-       X.Dom.Query._funcSelectorChild = function( type, flag_all, flags, xnodes ){\r
+       function X_Node_Selector__funcSelectorChild( type, flag_all, flags, xnodes ){\r
                var res      = [],\r
                        flag_not = flags.not,\r
                        i = 0, n = -1, xnode, node,\r
                        tagName, tmp;\r
                for( ; xnode = xnodes[ i ]; ++i ){\r
-                       tagName = flag_all || xnode._tag;\r
+                       tagName = flag_all || xnode[ '_tag' ];\r
                        tmp     = null;\r
                        if( /* tmp === null && */ type <= 0 ){\r
-                               for( node = xnode.prevNode(); node; node = node.prevNode() ){\r
-                                       if( node._xnodeType === 1 && ( flag_all || tagName === node._tag ) ){\r
+                               for( node = xnode[ 'prev' ](); node; node = node[ 'prev' ]() ){\r
+                                       if( node[ '_tag' ] && ( flag_all || tagName === node[ '_tag' ] ) ){\r
                                                tmp = false;\r
                                                break;\r
                                        };\r
                                };\r
                        };\r
                        if( tmp === null && 0 <= type ){\r
-                               for( node = xnode.nextNode(); node; node = node.nextNode() ){\r
-                                       if( node._xnodeType === 1 && ( flag_all || tagName === node._tag ) ){\r
+                               for( node = xnode[ 'next' ](); node; node = node[ 'next' ]() ){\r
+                                       if( node[ '_tag' ] && ( flag_all || tagName === node[ '_tag' ] ) ){\r
                                                tmp = false;\r
                                                break;\r
                                        };              \r
@@ -590,7 +598,7 @@ X.Dom.Query._parse = function( query, last ){
                };\r
                return res;\r
        };\r
-       X.Dom.Query._funcSelectorNth = function( pointer, sibling, flag_all, flags, xnodes, a, b ){\r
+       function X_Node_Selector__funcSelectorNth( pointer, sibling, flag_all, flags, xnodes, a, b ){\r
                var _data    = funcData,\r
                        res      = [],\r
                        checked  = {},\r
@@ -598,13 +606,13 @@ X.Dom.Query._parse = function( query, last ){
                        i = 0, n = -1, uid,\r
                        c, xnode, tmp, node, tagName;\r
                for( ; xnode = xnodes[ i ]; ++i ){\r
-                       uid = xnode._uid;\r
+                       uid = xnode[ '_uid' ];\r
                        tmp = checked[ uid ];\r
                        if( tmp === void 0 ){\r
-                               for( c = 0, node = xnode.parent[ pointer ](), tagName = flag_all || xnode._tag; node; node = node[ sibling ]() ){\r
-                                       if( node._xnodeType === 1 && ( flag_all || tagName === node._tag ) ){\r
+                               for( c = 0, node = xnode.parent[ pointer ](), tagName = flag_all || xnode[ '_tag' ]; node; node = node[ sibling ]() ){\r
+                                       if( node[ '_tag' ] && ( flag_all || tagName === node[ '_tag' ] ) ){\r
                                                ++c;\r
-                                               checked[ node._uid ] = a === 0 ? c === b : (c - b) % a === 0 && (c - b) / a >= 0;\r
+                                               checked[ node[ '_uid' ] ] = a === 0 ? c === b : (c - b) % a === 0 && (c - b) / a >= 0;\r
                                        };                                                      \r
                                };\r
                                tmp = checked[ uid ];\r
@@ -613,71 +621,71 @@ X.Dom.Query._parse = function( query, last ){
                };\r
                return res;\r
        };\r
-       X.Dom.Query._funcSelectorProp = function( prop, flag, flags, xnodes ){\r
+       function X_Node_Selector__funcSelectorProp( prop, flag, flags, xnodes ){\r
                var res = [],\r
                        flag_not = flag ? flags.not : !flags.not,\r
                        i = 0, n = -1, xnode;\r
                for( ; xnode = xnodes[ i ]; ++i ){\r
-                       if( xnode._attrs && xnode._attrs[ prop ] ^ flag_not ) res[ ++n ] = xnode;\r
+                       if( xnode[ '_attrs' ] && xnode[ '_attrs' ][ prop ] ^ flag_not ) res[ ++n ] = xnode;\r
                };\r
                return res;\r
        };\r
 \r
-X.Dom.Query._filter = {\r
-       root : function( elem ){\r
-               return elem === ( elem.ownerDocument || elem.document ).documentElement;\r
+var X_Node_Selector__filter = {\r
+       'root' : function(){\r
+               return X_Node_html;\r
        },\r
-       target : {\r
+       'target' : {\r
                m : function( flags, xnodes ){\r
                        var res  = [],\r
                                hash = location.hash.slice( 1 ),\r
                                flag_not = flags.not,\r
                                i = 0, n = -1, xnode;\r
                        for ( ; xnode = xnodes[ i ]; ++i ){\r
-                               if( ( ( xnode._id || xnode._attrs && xnode._attrs.name ) === hash ) ^ flag_not ) res[ ++n ] = xnode;                                            \r
+                               if( ( ( xnode[ '_id' ] || xnode[ '_attrs' ] && xnode[ '_attrs' ][ 'name' ] ) === hash ) ^ flag_not ) res[ ++n ] = xnode;                                                \r
                        };\r
                        return res;\r
                }\r
        },\r
        'first-child' : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( -1, true, flags, xnodes ); }\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorChild( -1, true, flags, xnodes ); }\r
        },\r
        'last-child' : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( 1, true, flags, xnodes ); }\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorChild( 1, true, flags, xnodes ); }\r
        },\r
        'only-child' : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( 0, true, flags, xnodes ); }\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorChild( 0, true, flags, xnodes ); }\r
        },\r
        'first-of-type' : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( -1, false, flags, xnodes ); }\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorChild( -1, false, flags, xnodes ); }\r
        },\r
        'last-of-type' : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( 1, false, flags, xnodes ); }\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorChild( 1, false, flags, xnodes ); }\r
        },\r
        'only-of-type' : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorChild( 0, false, flags, xnodes ); }\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorChild( 0, false, flags, xnodes ); }\r
        },\r
        'nth-child' : {\r
-               m : function( flags, xnodes, a, b ){ return X.Dom.Query._funcSelectorNth( 'firstChild', 'nextNode', true, flags, xnodes, a, b ); }\r
+               m : function( flags, xnodes, a, b ){ return X_Node_Selector__funcSelectorNth( 'firstChild', 'next', true, flags, xnodes, a, b ); }\r
        },\r
        'nth-last-child' : {\r
-               m : function( flags, xnodes, a, b ){ return X.Dom.Query._funcSelectorNth( 'lastChild', 'prevNode', true, flags, xnodes, a, b ); }\r
+               m : function( flags, xnodes, a, b ){ return X_Node_Selector__funcSelectorNth( 'lastChild', 'prev', true, flags, xnodes, a, b ); }\r
        },\r
        'nth-of-type' : {\r
-               m : function( flags, xnodes, a, b ){ return X.Dom.Query._funcSelectorNth( 'firstChild', 'nextNode', false, flags, xnodes, a, b ); }\r
+               m : function( flags, xnodes, a, b ){ return X_Node_Selector__funcSelectorNth( 'firstChild', 'next', false, flags, xnodes, a, b ); }\r
        },\r
        'nth-last-of-type' : {\r
-               m : function( flags, xnodes, a, b ){ return X.Dom.Query._funcSelectorNth( 'lastChild', 'prevNode', false, flags, xnodes, a, b ); }\r
+               m : function( flags, xnodes, a, b ){ return X_Node_Selector__funcSelectorNth( 'lastChild', 'prev', false, flags, xnodes, a, b ); }\r
        },\r
-       empty : {\r
+       'empty' : {\r
                m : function( flags, xnodes ){\r
                        var res = [],\r
                                flag_not = flags.not,\r
                                i = 0, n = -1, xnode, tmp, node;\r
                        for( ; xnode = xnodes[i]; ++i ){\r
                                tmp = true;\r
-                               for( node = xnode.firstChild(); node; node = node.nextSibling() ){\r
-                                       if( node._xnodeType === 1 || ( node._xnodeType === 3 && node._text ) ){\r
+                               for( node = xnode[ 'firstChild' ](); node; node = node[ 'next' ]() ){\r
+                                       if( node[ '_tag' ] || node[ '_text' ] ){\r
                                                tmp = false;\r
                                                break;\r
                                        };                              \r
@@ -687,25 +695,24 @@ X.Dom.Query._filter = {
                        return res;\r
                }\r
        },\r
-       link : {\r
+       'link' : {\r
                m : function( flags, xnodes ){\r
-                       var links = ( xnodes[ 0 ].ownerDocument || xnodes[ 0 ].document ).links,\r
-                               _data = funcData,\r
+                       var links = document.links,\r
                                res   = [],\r
                                checked, flag_not, i, link, xnode, n;\r
                        if( !links ) return res;\r
                        checked = {};\r
                        flag_not = flags.not;\r
                        for( i = 0; link = links[ i ]; ++i ){\r
-                               checked[ ( new Node( link ) )._uid ] = true;\r
+                               checked[ ( new 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
+                               if( checked[ xnode[ '_uid' ] ] ^ flag_not ) res[ ++n ] = xnode;\r
                        };\r
                        return res;\r
                }\r
        },\r
-       lang : {\r
+       'lang' : {\r
                m : function( flags, xnodes, arg ){\r
                        var res = [],\r
                                //reg = new RegExp('^' + arg, 'i'),\r
@@ -713,7 +720,7 @@ X.Dom.Query._filter = {
                                i = 0, n = -1, xnode, tmp, lang;\r
                        arg = arg.toLowerCase();\r
                        for( ; tmp = xnode = xnodes[ i ]; ++i ){\r
-                               while( tmp && !( lang = tmp._attrs && tmp._attrs[ 'lang' ] ) ){\r
+                               while( tmp && !( lang = tmp[ '_attrs' ] && tmp[ '_attrs' ][ 'lang' ] ) ){\r
                                        tmp = tmp.parent;\r
                                };\r
                                //tmp = !!(tmp && reg.test(tmp.getAttribute('lang')));\r
@@ -722,27 +729,24 @@ X.Dom.Query._filter = {
                        return res;\r
                }\r
        },\r
-       enabled : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorProp( 'disabled', false, flags, xnodes ); }\r
+       'enabled' : {\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorProp( 'disabled', false, flags, xnodes ); }\r
        },\r
-       disabled : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorProp( 'disabled', true, flags, xnodes ); }\r
+       'disabled' : {\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorProp( 'disabled', true, flags, xnodes ); }\r
        },\r
-       checked : {\r
-               m : function( flags, xnodes ){ return X.Dom.Query._funcSelectorProp( 'checked', true, flags, xnodes ); }\r
+       'checked' : {\r
+               m : function( flags, xnodes ){ return X_Node_Selector__funcSelectorProp( 'checked', true, flags, xnodes ); }\r
        },\r
-       contains : {\r
+       'contains' : {\r
                m : function( flags, xnodes, arg ){\r
                        var res = [],\r
                                flag_not = flags.not,\r
                                i = 0, n = -1, xnode;\r
                        for( ; xnode = xnodes[ i ]; ++i ){\r
-                               if ( ( -1 < ( xnode.text() ).indexOf( arg ) ) ^ flag_not ) res[ ++n ] = xnode;                                          \r
+                               if ( ( -1 < ( xnode[ 'text' ]() ).indexOf( arg ) ) ^ flag_not ) res[ ++n ] = xnode;                                             \r
                        };\r
                        return res;\r
                }\r
        }\r
 };\r
-\r
-\r
-\r