From: itozyun <itozyun@user.sourceforge.jp>
Date: Thu, 19 Nov 2015 15:27:14 +0000 (+0900)
Subject: Version 0.6.196, bug fixes X.XML & X.UI.ScrollBox.
X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=commitdiff_plain;h=43b7875a2aadc07439db67724e60644f129bcc90

Version 0.6.196, bug fixes X.XML & X.UI.ScrollBox.
---

diff --git a/0.6.x/js/01_core/03_XScript.js b/0.6.x/js/01_core/03_XScript.js
index b8255ca..753af82 100644
--- a/0.6.x/js/01_core/03_XScript.js
+++ b/0.6.x/js/01_core/03_XScript.js
@@ -9,20 +9,20 @@ var X_Script_VBS_ENABLED = X_UA[ 'Windows' ] && !X_UA[ 'WinCE' ] && !X_UA[ 'WinP
  * @type {object}
  */
 X[ 'Script' ] = {
-	'tryCatch' : X_Script_try
+
+	'tryIfSafe' : X_Script_try,
 	
+	/**
+	 * Visual Basic Script が使えるか?
+	 * @alias X.Script.VBS
+	 * @type {boolean}
+	 */
+	'VBS'       : X_Script_VBS_ENABLED
 	// git, strict mode, asm.js, 
 };
 
 if( X_Script_VBS_ENABLED ){
 	
-/**
- * Visual Basic Script が使えるか?
- * @alias X.Script.VBS
- * @type {boolean}
- */
-	X[ 'Script' ][ 'VBS' ] = true;
-	
 	X_Script_gte15 || document.write( '<script type=text/vbscript>' +
 		[
 			'Function vbs_testAXO(v)',
@@ -66,6 +66,12 @@ if( X_Script_VBS_ENABLED ){
 	// byte Array を扱う vba
 };
 
+/**
+ * try-catch 構文が使えて安全に実行できるなら、コードを実行する
+ * @alias X.Script.tryIfSafe
+ * @param {funciton} func
+ * @param {array=} 引数の入った配列
+ */
 function X_Script_try( func, args ){
 	if( !X_Script_gte15 ){
 		//return func.apply( {}, args );
diff --git a/0.6.x/js/02_dom/04_XBoxModel.js b/0.6.x/js/02_dom/04_XBoxModel.js
index e2b13be..43d7e99 100644
--- a/0.6.x/js/02_dom/04_XBoxModel.js
+++ b/0.6.x/js/02_dom/04_XBoxModel.js
@@ -65,7 +65,7 @@ X_ViewPort[ 'listenOnce' ]( X_EVENT_INIT, function(){
 function X_Node_BoxModel_mesure( that, name ){
 	var flags = that[ '_flags' ], elm;
 	
-	if( !this[ '_tag' ] || ( ( flags & X_NodeFlags_IN_TREE ) === 0 ) || ( flags & X_NodeFlags_STYLE_IS_DISPLAY_NONE ) ) return 0;
+	if( !that[ '_tag' ] || ( ( flags & X_NodeFlags_IN_TREE ) === 0 ) || ( flags & X_NodeFlags_STYLE_IS_DISPLAY_NONE ) ) return 0;
 	
 	X_Node_updateTimerID && X_Node_startUpdate();
 	
diff --git a/0.6.x/js/02_dom/08_XNodeSelector.js b/0.6.x/js/02_dom/08_XNodeSelector.js
index ca7fcd5..1208076 100644
--- a/0.6.x/js/02_dom/08_XNodeSelector.js
+++ b/0.6.x/js/02_dom/08_XNodeSelector.js
@@ -196,7 +196,7 @@ function X_Node_Selector__parse( query, last ){
 						not      = true;
 						selector = 0;
 						phase    = 0x0;
-						name     = null;					
+						name     = null;
 					};
 					//continue;
 				} else
diff --git a/0.6.x/js/02_dom/20_XNode.js b/0.6.x/js/02_dom/20_XNode.js
index cc826b1..7f125ff 100644
--- a/0.6.x/js/02_dom/20_XNode.js
+++ b/0.6.x/js/02_dom/20_XNode.js
@@ -445,6 +445,7 @@ function X_Node_toggleInGPUFlag( gpuRoot, xnodes, flag ){
  */
 function X_Node_create( tag, opt_attrs, opt_css ){
 	var xnode;
+
 	if( !this[ '_tag' ] ) return;
 	this[ 'append' ]( xnode = X_Doc_create( tag, opt_attrs, opt_css ) );
 	return xnode;
diff --git a/0.6.x/js/05_util/04_XXML.js b/0.6.x/js/05_util/04_XXML.js
index 38fcaf3..df77214 100644
--- a/0.6.x/js/05_util/04_XXML.js
+++ b/0.6.x/js/05_util/04_XXML.js
@@ -171,7 +171,7 @@ function XMLWrapper_val( queryString, type ){
 			n = -1;	
 			isMulti = isMulti || 1 < l;
 			
-			console.log( 'combinator ' + combinator );
+			//console.log( 'combinator ' + combinator );
 	
 			switch( combinator ){
 				// > TagName|*
@@ -222,12 +222,12 @@ function XMLWrapper_val( queryString, type ){
 					break;
 				default :
 					if( combinator === 1 || ( isStart && selector < 7 ) ){
-						console.log( l + ' > ' + xmlList.length + ' tag:' + tagName );
+						//console.log( l + ' > ' + xmlList.length + ' tag:' + tagName );
 						for( ; i < l; ++i ){
 							xml = parents[ i ];
 							xml.childNodes && xml.childNodes.length && XMLWrapper_fetchElements( xmlList, xml, isAll ? null : tagName );
 						};
-						console.log( l + ' >> ' + xmlList.length + ' tag:' + tagName );
+						//console.log( l + ' >> ' + xmlList.length + ' tag:' + tagName );
 					};
 			};
 			
@@ -245,7 +245,7 @@ function XMLWrapper_val( queryString, type ){
 				// :, 擬似クラス
 				case 4 :
 					if( !( filter = XMLWrapper_filter[ name ] ) ){
-						return XMLListWrapper_0;;
+						return XMLListWrapper_0;
 					};
 					break;
 				// [] 属性
@@ -267,7 +267,7 @@ function XMLWrapper_val( queryString, type ){
 							filter = [ 'class', 3, name ]; break;
 						// :, 擬似クラス
 						case 4 :
-							if( !( filter = X_Node_Selector__filter[ name ] ) ){
+							if( !( filter = XMLWrapper_filter[ name ] ) ){
 								return [];
 							};
 							break;
@@ -442,13 +442,13 @@ function XMLWrapper_val( queryString, type ){
 	function XMLWrapper_funcSelectorChild( type, flag_all, flags, xmlList ){
 		var res      = [],
 			flag_not = flags.not,
-			i = 0, n = -1, xnode, node,
+			i = 0, n = -1, xml, node,
 			tagName, tmp;
-		for( ; xnode = xmlList[ i ]; ++i ){
-			tagName = flag_all || xnode.tagName;
+		for( ; xml = xmlList[ i ]; ++i ){
+			tagName = flag_all || xml.tagName;
 			tmp     = null;
 			if( /* tmp === null && */ type <= 0 ){
-				for( node = xnode.previousSibling; node; node = node.previousSibling ){
+				for( node = xml.previousSibling; node; node = node.previousSibling ){
 					if( node.nodeType === 1 && ( flag_all || tagName === node.tagName ) ){
 						tmp = false;
 						break;
@@ -456,7 +456,7 @@ function XMLWrapper_val( queryString, type ){
 				};
 			};
 			if( tmp === null && 0 <= type ){
-				for( node = xnode.nextSibling; node; node = node.nextSibling ){
+				for( node = xml.nextSibling; node; node = node.nextSibling ){
 					if( node.nodeType === 1 && ( flag_all || tagName === node.tagName ) ){
 						tmp = false;
 						break;
@@ -464,29 +464,32 @@ function XMLWrapper_val( queryString, type ){
 				};						
 			};
 			if( tmp === null ) tmp = true;
-			if( tmp ^ flag_not ) res[ ++n ] = xnode;
+			if( tmp ^ flag_not ) res[ ++n ] = xml;
 		};
 		return res;
 	};
 	function XMLWrapper_funcSelectorNth( pointer, sibling, flag_all, flags, xmlList, a, b ){
-		var res      = [],
+		var uids     = X_Array_copy( xmlList ),
+			res      = [],
 			checked  = {},
 			flag_not = flags.not,
-			i = 0, n = -1, uid,
-			c, xnode, tmp, node, tagName;
-		for( ; xnode = xmlList[ i ]; ++i ){
-			uid = xnode._uid;
-			tmp = checked[ uid ];
+			i = 0, n = -1,
+			c, xml, tmp, node, tagName, uid;
+
+		for( ; xml = xmlList[ i ]; ++i ){
+			tmp = checked[ i ];
 			if( tmp === undefined ){
-				for( c = 0, node = xnode.parentNode[ pointer ], tagName = flag_all || xnode.tagName; node; node = node[ sibling ] ){
+				for( c = 0, node = xml.parentNode[ pointer ], tagName = flag_all || xml.tagName; node; node = node[ sibling ] ){
 					if( node.nodeType === 1 && ( flag_all || tagName === node.tagName ) ){
 						++c;
-						checked[ node._uid ] = a === 0 ? c === b : (c - b) % a === 0 && (c - b) / a >= 0;
-					};							
+						uid = uids.indexOf( node );
+						if( uid === -1 ) uids[ uid = uids.length ] = node;
+						checked[ uid ] = a === 0 ? c === b : (c - b) % a === 0 && (c - b) / a >= 0;
+					};
 				};
-				tmp = checked[ uid ];
+				tmp = checked[ i ];
 			};
-			if( tmp ^ flag_not ) res[ ++n ] = xnode;
+			if( tmp ^ flag_not ) res[ ++n ] = xml;
 		};
 		return res;
 	};
@@ -494,9 +497,9 @@ function XMLWrapper_val( queryString, type ){
 	function XMLWrapper_funcSelectorProp( prop, flag, flags, xmlList ){
 		var res = [],
 			flag_not = flag ? flags.not : !flags.not,
-			i = 0, n = -1, xnode;
-		for( ; xnode = xmlList[ i ]; ++i ){
-			if( xnode.getAttributeNode( prop ) ^ flag_not ) res[ ++n ] = xnode;
+			i = 0, n = -1, xml;
+		for( ; xml = xmlList[ i ]; ++i ){
+			if( xml.getAttributeNode( prop ) ^ flag_not ) res[ ++n ] = xml;
 		};
 		return res;
 	}; */
@@ -536,16 +539,16 @@ var XMLWrapper_filter = {
 		m : function( flags, xmlList ){
 			var res = [],
 				flag_not = flags.not,
-				i = 0, n = -1, xnode, tmp, node;
-			for( ; xnode = xmlList[i]; ++i ){
+				i = 0, n = -1, xml, tmp, node;
+			for( ; xml = xmlList[i]; ++i ){
 				tmp = true;
-				for( node = xnode.firstChild; node; node = node.nextSibling ){
+				for( node = xml.firstChild; node; node = node.nextSibling ){
 					if( node.nodeType === 1 || ( node.nodeType === 3 && node.nodeValue ) ){
 						tmp = false;
 						break;
 					};				
 				};
-				if( tmp ^ flag_not ) res[ ++n ] = xnode;
+				if( tmp ^ flag_not ) res[ ++n ] = xml;
 			};
 			return res;
 		}
@@ -554,20 +557,19 @@ var XMLWrapper_filter = {
 		m : function( flags, xmlList, arg ){
 			var res = [],
 				flag_not = flags.not,
-				i = 0, n = -1, xnode, text = '';
+				i = 0, n = -1, xml, text = '';
 
-			for( ; xnode = xmlList[ i ]; ++i ){
-				switch( xnode.nodeType ){
+			for( ; xml = xmlList[ i ]; ++i ){
+				switch( xml.nodeType ){
 					case 1 :
-						text = xml.nodeType === 1 ? xml.innerText || xml.text || xml.textContent : xml.nodeValue;
+						text = xml.innerText || xml.text || xml.textContent;
 						break;
 					//case 2 :
 					case 3 :
-						text = xnode.nodeValue;
+						text = xml.nodeValue;
 						break;
 				};
-				console.log( text + ' ' + arg );
-				if ( ( -1 < text.indexOf( arg ) ) ^ flag_not ) res[ ++n ] = xnode;						
+				if ( ( -1 < text.indexOf( arg ) ) ^ flag_not ) res[ ++n ] = xml;		
 			};
 			return res;
 		}
diff --git a/0.6.x/js/20_ui/05_XUI_Gesture.js b/0.6.x/js/20_ui/05_XUI_Gesture.js
index e726389..c738b38 100644
--- a/0.6.x/js/20_ui/05_XUI_Gesture.js
+++ b/0.6.x/js/20_ui/05_XUI_Gesture.js
@@ -259,7 +259,7 @@ function XUI_Gesture_handleEvent( e ){
 			isMouse    = e.pointerType === 'mouse',
 			touches    = [], 
 			numTouches = 0,// count the total touches on the screen
-			i, p, l, j, captured, ret, activated, gesture, startEv,
+			i, p, l, j, captured, hammerEvent, ret, activated, gesture, startEv,
 			deltaTime, deltaX, deltaY, velocity, center, startCenter;
 
 		if( !isStart && !hammer.gestureStartEvent ) return;
diff --git a/0.6.x/js/20_ui/15_ScrollBox.js b/0.6.x/js/20_ui/15_ScrollBox.js
index f7d334b..3838363 100644
--- a/0.6.x/js/20_ui/15_ScrollBox.js
+++ b/0.6.x/js/20_ui/15_ScrollBox.js
@@ -12,8 +12,10 @@ function XUI_ScrollBox_start( scrollBox ){
 	if( scrollBox.hasVScroll ){
 		if( !XUI_ScrollBox_indicatorV ){
 			XUI_ScrollBox_indicatorV = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorV' );
-			
 		};
+		if( XUI_ScrollBox_current )
+			XUI_ScrollBox_current[ 'unlisten' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );
+		
 		scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorV );
 		XUI_ScrollBox_indicatorV[ 'animate' ](
 				{ opacity : 0 },
@@ -22,11 +24,17 @@ function XUI_ScrollBox_start( scrollBox ){
 			);
 		scrollBox
 			[ 'listenOnce' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorV, XUI_ScrollBox_indicatorHandleEvent );
+	} else
+	if( XUI_ScrollBox_indicatorV ){
+		XUI_ScrollBox_indicatorV[ 'remove' ]();
 	};
+	
 	if( scrollBox.hasHScroll ){
 		if( !XUI_ScrollBox_indicatorH ){
 			XUI_ScrollBox_indicatorH = X_Doc_create( 'div' )[ 'className' ]( 'ScrollBox-IndicatorH' );
 		};
+		if( XUI_ScrollBox_current )
+			XUI_ScrollBox_current[ 'unlisten' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );
 		scrollBox.xnode[ 'append' ]( XUI_ScrollBox_indicatorH );
 		XUI_ScrollBox_indicatorH[ 'animate' ](
 				{ opacity : 0 },
@@ -35,7 +43,11 @@ function XUI_ScrollBox_start( scrollBox ){
 			);
 		scrollBox
 			[ 'listenOnce' ]( [ X_EVENT_CANCELED, XUI_Event.SCROLL_END ], XUI_ScrollBox_indicatorH, XUI_ScrollBox_indicatorHandleEvent );
+	} else
+	if( XUI_ScrollBox_indicatorH ){
+		XUI_ScrollBox_indicatorH[ 'remove' ]();
 	};
+	XUI_ScrollBox_current = scrollBox;
 };
 
 function XUI_ScrollBox_indicatorHandleEvent( e ){