X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F02_dom%2F08_XNodeSelector.js;h=1268ac33acab85dba041747d26e0e10d44f627e7;hb=83a329e3210a40f383282389a48a33ea34ccfa1f;hp=e7eded487dca1db9d43c81ad42b12c957df1518f;hpb=42e0982b02a99c71702ce8cd8740645aefdc8097;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/02_dom/08_XNodeSelector.js b/0.6.x/js/02_dom/08_XNodeSelector.js
index e7eded4..1268ac3 100644
--- a/0.6.x/js/02_dom/08_XNodeSelector.js
+++ b/0.6.x/js/02_dom/08_XNodeSelector.js
@@ -8,21 +8,21 @@
  */
 
 var
-	X_Node_Selector__PSEUDO    = {
+	X_Node_Selector__PSEUDO = {
 		'nth-child'        : 9,
 		'nth-last-child'   : 14,
 		'nth-of-type'      : 11,
 		'nth-last-of-type' : 16,
-		root               : 4,
-		link               : 4,
-		lang               : 4,
-		empty              : 5,
-		target             : 6,
-		invalid            : 7,
-		enabled            : 7,
-		checked            : 7,
-		disabled           : 8,
-		contains           : 8,
+		'root'             : 4,
+		'link'             : 4,
+		'lang'             : 4,
+		'empty'            : 5,
+		'target'           : 6,
+		'invalid'          : 7,
+		'enabled'          : 7,
+		'checked'          : 7,
+		'disabled'         : 8,
+		'contains'         : 8,
 		'last-child'       : 10,
 		'only-child'       : 10,			
 		'first-child'      : 11,
@@ -41,16 +41,16 @@ var
 		'@'   : 6  // XML 用の拡張、属性ノードを辿る　http://www.marguerite.jp/Nihongo/WWW/RefDOM/_Attr_interface.html
 	},
 	X_Node_Selector__SELECTOR = {
-		''    : 0, // none
-		tag   : 1,
-		'#'   : 2,
-		'.'   : 3,
-		':'   : 4,
-		'['   : 5,
-		not   : 6,
-		scope : 7,
-		root  : 8,
-		link  : 9
+		''      : 0, // none
+		'tag'   : 1,
+		'#'     : 2,
+		'.'     : 3,
+		':'     : 4,
+		'['     : 5,
+		'not'   : 6,
+		'scope' : 7,
+		'root'  : 8,
+		'link'  : 9
 	},
 	X_Node_Selector__OPERATORS = { '==' : 1, '!=': 2, '~=': 3, '^=': 4, '$=': 5, '*=': 6, '|=': 7 }, // '':0 は属性が存在するならtrue
 	// TODO { a : 1, A : 2, _ : 3,,, }
@@ -632,8 +632,8 @@ function X_Node_Selector__parse( query, last ){
 	};
 
 var X_Node_Selector__filter = {
-	'root' : function( elem ){
-		return elem === ( elem.ownerDocument || elem.document ).documentElement;
+	'root' : function(){
+		return X_Node_html;
 	},
 	'target' : {
 		m : function( flags, xnodes ){
@@ -684,7 +684,7 @@ var X_Node_Selector__filter = {
 				i = 0, n = -1, xnode, tmp, node;
 			for( ; xnode = xnodes[i]; ++i ){
 				tmp = true;
-				for( node = xnode[ 'firstChild' ](); node; node = node.nextSibling() ){
+				for( node = xnode[ 'firstChild' ](); node; node = node[ 'next' ]() ){
 					if( node[ '_tag' ] || node[ '_text' ] ){
 						tmp = false;
 						break;