OSDN Git Service

Fix the bug of X.NodeAnime.
[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 08_XNodeSelector.js
index 578d9b2..0868315 100644 (file)
@@ -1,4 +1,4 @@
-/**\r
+/*\r
  * Original code by ofk ( kQuery, ksk )\r
  * http://d.hatena.ne.jp/ofk/comment/20090106/1231258010\r
  * http://d.hatena.ne.jp/ofk/20090111/1231668170 \r
@@ -56,9 +56,6 @@ var
        // TODO { a : 1, A : 2, _ : 3,,, }\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
@@ -81,10 +78,11 @@ function X_Node_Selector__parse( query, last ){
                chr, chrCode, nameChr, name1st,\r
                tmp, escape, quot, start,\r
                name, key, value, operator, a, b, not;\r
+\r
        query += ' ';\r
        while( i < l ){\r
                chr     = query.charAt( ++i );\r
-               chrCode = ALPHABET.indexOf( chr );\r
+               chrCode = ALPHABET.indexOf( chr ); // TODO この関数無くす!\r
                nameChr = chrCode !== -1;\r
                name1st = nameChr && chrCode < 52;\r
                switch( phase ){\r
@@ -198,7 +196,7 @@ function X_Node_Selector__parse( query, last ){
                                                not      = true;\r
                                                selector = 0;\r
                                                phase    = 0x0;\r
-                                               name     = null;                                        \r
+                                               name     = null;\r
                                        };\r
                                        //continue;\r
                                } else\r
@@ -228,10 +226,34 @@ function X_Node_Selector__parse( query, last ){
        return not ? [ i + tmp + 1, [ combinator, 6, result ] ] : [ i, result ];\r
 };\r
 \r
-       // セレクター\r
-       X[ 'Doc' ][ 'find' ] = X_shortcutFunction = Node.prototype[ 'find' ] = X_NodeList.prototype[ 'find' ] = function ( queryString ){\r
+       /**\r
+        * selector を使って Node, NodeList を取得する\r
+        * @alias X.Doc.find\r
+        * @function\r
+        * @param {string} セレクター文字列\r
+        * @return {Node|NodeList}\r
+        */\r
+       X[ 'Doc' ][ 'find' ] = X_shortcutFunction =\r
+\r
+       /**\r
+        * selector を使って Node, NodeList を取得する\r
+        * @alias NodeList.prototype.find\r
+        * @function\r
+        * @param {string} セレクター文字列\r
+        * @return {Node|NodeList}\r
+        */\r
+       X_NodeList.prototype[ 'find' ] = X_Node_find;\r
+       \r
+       /**\r
+        * selector を使って Node, NodeList を取得する\r
+        * @alias Node.prototype.find\r
+        * @function\r
+        * @param {string} セレクター文字列\r
+        * @return {Node|NodeList}\r
+        */     \r
+       function X_Node_find( queryString ){\r
                var HTML      = X_Node_html,\r
-                       scope     = this.constructor === X_NodeList && this.length ? this : [ this.constructor === Node ? this : X_Node_body ],\r
+                       scope     = this.constructor === X_NodeList && this.length ? this : [ this.constructor === Node || this[ 'instanceOf' ] && this[ 'instanceOf' ]( 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
@@ -259,7 +281,7 @@ function X_Node_Selector__parse( query, last ){
                /*]@+debug*/\r
 \r
                // 文字列以外は空で返す\r
-               if( typeof queryString !== 'string' ) return ret;\r
+               if( !X_Type_isString( queryString ) ) return ret;\r
                \r
                xnodes = [];\r
                \r
@@ -271,7 +293,7 @@ function X_Node_Selector__parse( query, last ){
                        if( !parsed ){\r
                                parsed = X_Node_Selector__parse( queryString );\r
                                \r
-                               if( typeof parsed === 'number' ){\r
+                               if( X_Type_isNumber( parsed ) ){\r
                                        // error\r
                                        return [];\r
                                };\r
@@ -396,10 +418,7 @@ function X_Node_Selector__parse( query, last ){
                                                };\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 ? '' : tagName, merge );\r
-                                               };\r
+                                               X_Node_Selector__fetchElements( xnodes, parents, isAll ? '' : tagName, merge );\r
                                                //console.log( l + ' >> ' + xnodes.length + ' tag:' + tagName );\r
                                        };\r
                        };\r
@@ -480,7 +499,7 @@ function X_Node_Selector__parse( query, last ){
                                        );\r
                                } else\r
                                // filterが関数の場合\r
-                               if( typeof filter === 'function' ){\r
+                               if( X_Type_isFunction( filter ) ){\r
                                        tmp = [];\r
                                        for( i = 0, n = -1; xnode = xnodes[ i ]; ++i ){\r
                                                if( ( !!filter( xnode ) ) ^ isNot ) tmp[ ++n ] = xnode; \r
@@ -592,6 +611,7 @@ function X_Node_Selector__parse( query, last ){
                var l = xnodes.length,\r
                        i = 0,\r
                        j, child, _xnodes;\r
+\r
                for( ; i < l; ++i ){\r
                        child = xnodes[ i ];\r
                        if( !child[ '_tag' ] ) continue;\r
@@ -611,23 +631,70 @@ function X_Node_Selector__parse( query, last ){
                        };\r
                };\r
        };\r
-       \r
-       function X_Node_Selector__fetchElements( list, parent, tag, merge ){\r
-               var xnodes = parent[ '_xnodes' ],\r
-                       l      = xnodes.length,\r
+\r
+       function X_Node_Selector__fetchElements( list, xnodes, tag, merge ){\r
+               var l      = xnodes.length,\r
                        i      = 0,\r
-                       child, uid;\r
-               for( ; i < l; ++i ){\r
+                       child, uid, _tag, _xnodes;\r
+\r
+               for( ; i < l; ++i ){ // for( ; child = xnodes[ ++i ]; )\r
                        child = xnodes[ i ];\r
                        uid   = child[ '_uid' ];\r
-                       if( !merge[ uid ] && child[ '_tag' ] ){\r
+                       _tag  = child[ '_tag' ];\r
+                       if( !merge[ uid ] && _tag ){\r
                                merge[ uid ] = true;\r
-                               ( !tag || child[ '_tag' ] === tag ) && ( list[ list.length ] = child );\r
-                               child[ '_xnodes' ] && X_Node_Selector__fetchElements( list, child, tag, merge );\r
+                               ( !tag || tag === _tag ) && ( list[ list.length ] = child );\r
+                               if( ( _xnodes = child[ '_xnodes' ] ) && ( 1 < _xnodes.length || ( _xnodes[ 0 ] && _xnodes[ 0 ][ '_tag' ] ) ) ){\r
+                                       X_Node_Selector__fetchElements( list, _xnodes, tag, merge );\r
+                               };\r
                        };\r
                };\r
        };\r
-\r
+/*\r
+       function X_Node_Selector__fetchElements( list, parent, tag, merge ){\r
+               \r
+               var xnodes   = parent[ '_xnodes' ],\r
+                       memory   = {\r
+                               i      : 0,\r
+                               l      : xnodes.length,\r
+                               xnodes : xnodes\r
+                       },              \r
+                       memories = [ memory ],\r
+                       i, l, xnode,\r
+                       uid, _xnodes;\r
+               \r
+               while( memories.length ){\r
+                       memory = memories.pop();\r
+                       xnodes = memory.xnodes;\r
+                       i      = memory.i;\r
+                       l      = memory.l;\r
+                       for( ; i < l; ++i ){\r
+                               xnode = xnodes[ i ];\r
+                               uid   = xnode[ '_uid' ];\r
+                               if( !merge[ uid ] && xnode[ '_tag' ] ){\r
+                                       if( !tag || xnode[ '_tag' ] === tag ) list[ list.length ] = xnode;\r
+                                       \r
+                                       if( _xnodes = xnode[ '_xnodes' ] ){\r
+                                               if( 1 < _xnodes.length || ( _xnodes[ 0 ] && _xnodes[ 0 ][ '_tag' ] ) ){\r
+                                                       memory.i = i + 1;\r
+                                                       memory.l = l;\r
+                                                       memory.xnodes = xnodes;\r
+                                                       memories[ memories.length ] = memory;\r
+                                                       memories[ memories.length ] = {\r
+                                                               i      : 0,\r
+                                                               l      : _xnodes.length,\r
+                                                               xnodes : _xnodes\r
+                                                       };\r
+                                                       merge[ uid ] = true;\r
+                                                       break;\r
+                                               };\r
+                                       };\r
+                               };\r
+                               merge[ uid ] = true;\r
+                       };\r
+               };\r
+       };\r
+ */\r
        function X_Node_Selector__funcSelectorChild( type, flag_all, flags, xnodes ){\r
                var res      = [],\r
                        flag_not = flags.not,\r
@@ -658,8 +725,7 @@ function X_Node_Selector__parse( query, last ){
                return res;\r
        };\r
        function X_Node_Selector__funcSelectorNth( pointer, sibling, flag_all, flags, xnodes, a, b ){\r
-               var _data    = funcData,\r
-                       res      = [],\r
+               var res      = [],\r
                        checked  = {},\r
                        flag_not = flags.not,\r
                        i = 0, n = -1, uid,\r