X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F02_XNetJSONP.js;h=b233d7b9aa6fcc518e0c1750b88b36cc1c42290d;hb=9e04e2a1221a92960a74e550bc3fd809caf3cd1c;hp=efff27d3d5b0521ecce46b2e1f895cd5ca6fc222;hpb=3d352d8bf476ab57cc333e8d02d0e6ea5efa69b7;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/06_net/02_XNetJSONP.js b/0.6.x/js/06_net/02_XNetJSONP.js
index efff27d..b233d7b 100644
--- a/0.6.x/js/06_net/02_XNetJSONP.js
+++ b/0.6.x/js/06_net/02_XNetJSONP.js
@@ -24,43 +24,43 @@
 	// TODO iframe useful or not. TODO check dynamicIframe
 	// TODO file: では　http: は使えない
 
-X_TEMP.X_NET_JSONP_cb = function( accessKey, jsonString, time, opt_json2FileSize ){
-			if( accessKey !== X_NET_JSONP_ACCESS_KEY || !X_NET_JSONPWrapper._busy ) return;
+X_TEMP.X_JSONP_cb = function( accessKey, jsonString, time, opt_json2FileSize ){
+			if( accessKey !== X_JSONP_ACCESS_KEY || !X_JSONP._busy ) return;
 			
-			X_NET_JSONPWrapper._busy = false;
+			X_JSONP._busy = false;
 			
-			X_NET_JSONPWrapper
+			X_JSONP
 				[ 'asyncDispatch' ]( {
 					type     : jsonString ? X_EVENT_SUCCESS : X_EVENT_ERROR,
 					response : X_JSON_parseTrustableString( jsonString )
 				} );
 			
-			X_Net_JSONP_errorTimerID && X_Timer_remove( X_Net_JSONP_errorTimerID );
+			X_JSONP_errorTimerID && X_Timer_remove( X_JSONP_errorTimerID );
 			
 			console.log( 'ms : ' + time + ' speed : ' + ( ( jsonString.length + ( opt_json2FileSize || 0 ) ) / time * 1000 ) + ' バイト/秒.' );
 	};
 
-var X_NET_JSONP_ACCESS_KEY = Math.random(),
+var X_JSONP_ACCESS_KEY = Math.random(),
 	
-	X_Net_JSONP_maxOnloadCount,
+	X_JSONP_maxOnloadCount,
 	
-	X_Net_JSONP_onloadCount = 0,
+	X_JSONP_onloadCount = 0,
 	
-	X_Net_JSONP_errorTimerID;
+	X_JSONP_errorTimerID;
 
-X_TEMP.X_NET_JSONP_init = function(){
-	X[ 'Net' ][ '__json_cb__' ] = X_TEMP.X_NET_JSONP_cb;
+X_TEMP.X_JSONP_init = function(){
+	X[ 'Net' ][ '__json_cb__' ] = X_TEMP.X_JSONP_cb;
 	
-	X_NET_JSONPWrapper = X_Class_override( X_NinjaIframe(), X_TEMP.X_NET_JSONP_params );
+	X_JSONP = X_Class_override( X_NinjaIframe(), X_TEMP.X_JSONP_params );
 	
-	delete X_TEMP.X_NET_JSONP_cb;
-	delete X_TEMP.X_NET_JSONP_init;
-	delete X_TEMP.X_NET_JSONP_params;
+	delete X_TEMP.X_JSONP_cb;
+	delete X_TEMP.X_JSONP_init;
+	delete X_TEMP.X_JSONP_params;
 	
-	return X_NET_JSONPWrapper;
+	return X_JSONP;
 };
 
-X_TEMP.X_NET_JSONP_params = {
+X_TEMP.X_JSONP_params = {
 	
 			_busy         : false,
 			_canceled     : false,
@@ -75,6 +75,11 @@ X_TEMP.X_NET_JSONP_params = {
 					json2FileSize = 18103,
 					html;
 				
+				// file プロトコルで外部アクセスの禁止
+				if( !X_URL_isSameProtocol( url ) ){
+					return X_JSONP[ 'asyncDispatch' ]( X_EVENT_ERROR );
+				};
+				
 				url = X_URL_create( url, params );
 				
 				if( !callback && !( callback = X_URL_paramToObj( url.split( '?' )[ 1 ] )[ 'callback' ] ) ){
@@ -95,12 +100,12 @@ X_TEMP.X_NET_JSONP_params = {
 						'<script>',
 							'onunload=function(){im.onload=im.onerror=""};',
 							'nw=+new Date;',
-							'function ', callback, '(o){if(nw){nw-=+new Date;parent.X.Net.__json_cb__(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw', window[ 'JSON' ] ? json2FileSize : 0 ,');nw=0}}',
+							'function ', callback, '(o){if(nw){nw-=+new Date;parent.X.Net.__json_cb__(' + X_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw', window[ 'JSON' ] ? json2FileSize : 0 ,');nw=0}}',
 						'</script>',	
 						'<script', charset, ' id="jp"></script>',
 						'<img id="im" src="', url, '" onload="jp.src=im.src" onerror="jp.src=im.src">'
 					];
-					X_Net_JSONP_maxOnloadCount = 2;
+					X_JSONP_maxOnloadCount = 2;
 				} else
 				if( X_UA[ 'IE8' ] ){
 					html = [
@@ -108,42 +113,42 @@ X_TEMP.X_NET_JSONP_params = {
 						'<script>',
 							'onunload=function(){clearTimeout(id)};',
 							'nw=0;', // なぜか必要,,,
-							'function ', callback, '(o){nw-=+new Date;parent.X.Net.__json_cb__(' + X_NET_JSONP_ACCESS_KEY + ',parent.X.JSON.stringify(o),-nw)}',
-							//'function ', callback, '(o){if(nw){nw-=+new Date;postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),"*");nw=0}}',			
+							'function ', callback, '(o){nw-=+new Date;parent.X.Net.__json_cb__(' + X_JSONP_ACCESS_KEY + ',parent.X.JSON.stringify(o),-nw)}',
+							//'function ', callback, '(o){if(nw){nw-=+new Date;postMessage("', X_JSONP_SEND_MSG_KEY,' "+nw+"|"+parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),"*");nw=0}}',			
 							'function tm(){jp.src="', url ,'";nw=+new Date}',
 							'id=setTimeout(tm,16);',
 						'</script>'
 						
 						/*　以下のコードは XP ie8 では動くけど、win8 IE11(8モード)で動かない 開発の便宜を取って,setTimeout を挟む
 						'<script>',
-							'function ', callback, '(o){window.parent.X.Net.__json_cb__(' + X_NET_JSONP_ACCESS_KEY + ',window.parent.JSON.stringify(o))}',
+							'function ', callback, '(o){window.parent.X.Net.__json_cb__(' + X_JSONP_ACCESS_KEY + ',window.parent.JSON.stringify(o))}',
 						'</script>',
 						'<script src="', url, '"></script>' */
 					];
-					X_Net_JSONP_maxOnloadCount = 2;
+					X_JSONP_maxOnloadCount = 2;
 				} else
 				if( X_UA[ 'IE9' ] ){
 					html = [
 						'<script', charset, ' id="jp"></script>',
 						'<script>',
 							'onunload=function(){clearTimeout(id)};',
-							'function ', callback, '(o){nw-=+new Date;parent.X.Net.__json_cb__(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw)}',
+							'function ', callback, '(o){nw-=+new Date;parent.X.Net.__json_cb__(' + X_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw)}',
 							'function tm(){jp.src="', url ,'";nw=+new Date}',
 							'id=setTimeout(tm,16);',
 						'</script>'
 					];
-					X_Net_JSONP_maxOnloadCount = 2;
+					X_JSONP_maxOnloadCount = 2;
 				} else
 				if( window[ 'JSON' ] ){
 					html = [	
 						'<script>',
 							'nw=+new Date;',
-							'function ', callback, '(o){if(nw){nw-=+new Date;parent.X.Net.__json_cb__(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw);nw=0}}',
-							//'function ', callback, '(o){if(nw){nw-=+new Date;parent.postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+JSON.stringify(o),"', location.origin, '");nw=0}}',
+							'function ', callback, '(o){if(nw){nw-=+new Date;parent.X.Net.__json_cb__(' + X_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw);nw=0}}',
+							//'function ', callback, '(o){if(nw){nw-=+new Date;parent.postMessage("', X_JSONP_SEND_MSG_KEY,' "+nw+"|"+JSON.stringify(o),"', location.origin, '");nw=0}}',
 						'</script>',
 						'<script', charset, ' src="', url, '"></script>'
 					];
-					X_Net_JSONP_maxOnloadCount = 1;
+					X_JSONP_maxOnloadCount = 1;
 				} else
 				if( X_UA[ 'IE4' ] || X_UA[ 'MacIE' ] ){
 					html = [
@@ -151,13 +156,13 @@ X_TEMP.X_NET_JSONP_params = {
 						'<script', charset, ' id="jp"></script>',
 						'<script>',
 							'onunload=function(){clearTimeout(id)};',
-							'function ', callback, '(o){nw-=new Date;parent.X.Net.__json_cb__(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
+							'function ', callback, '(o){nw-=new Date;parent.X.Net.__json_cb__(' + X_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
 							'function t1(){document.all.jn.src="', json2Path ,'";id=setTimeout("t2()",16);nw=+new Date}',
 							'id=setTimeout("t1()",16);',
 							'function t2(){if(window.JSON){document.all.jp.src="', url ,'"}else{id=setTimeout("t2()",16)}}',
 						'</script>'
 					];
-					X_Net_JSONP_maxOnloadCount = 3;
+					X_JSONP_maxOnloadCount = 3;
 				} else
 				if( X_UA[ 'IE' ] < 8 ){ // ie5-7
 					html = [
@@ -165,58 +170,58 @@ X_TEMP.X_NET_JSONP_params = {
 						'<script', charset, ' id="jp"></script>',
 						'<script>',
 							'onunload=function(){clearTimeout(id)};',
-							'function ', callback, '(o){nw-=new Date;parent.X.Net.__json_cb__(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
+							'function ', callback, '(o){nw-=new Date;parent.X.Net.__json_cb__(' + X_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
 							'function t1(){jn.src="', json2Path ,'";id=setTimeout(t2,16);nw=+new Date}',
 							'id=setTimeout(t1,16);',
 							'function t2(){if(window.JSON){jp.src="', url ,'"}else{id=setTimeout(t2,16)}}',
 						'</script>'
 					];
-					X_Net_JSONP_maxOnloadCount = 3;
+					X_JSONP_maxOnloadCount = 3;
 				} else {
 					html = [
 						'<script>',
-							'function ', callback, '(o){if(nw){nw-=new Date;parent.X.Net.__json_cb__(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw,', json2FileSize, ');nw=0}}',
+							'function ', callback, '(o){if(nw){nw-=new Date;parent.X.Net.__json_cb__(' + X_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw,', json2FileSize, ');nw=0}}',
 							'nw=+new Date;',
 						'</script>',
 						'<script src="', json2Path, '"></script>',
 						'<script', charset, ' src="', url, '"></script>'
 					];
-					X_Net_JSONP_maxOnloadCount = 2;
+					X_JSONP_maxOnloadCount = 2;
 				};
 				
-				X_NET_JSONPWrapper
+				X_JSONP
 					[ 'refresh' ]( html.join( '' ) )
-					[ 'listen' ]( [ 'ninjaload', 'ninjaerror' ], X_NET_JSONP_iframeListener );
+					[ 'listen' ]( [ 'ninjaload', 'ninjaerror' ], X_JSONP_iframeListener );
 							
-				X_NET_JSONPWrapper._busy = true;
+				X_JSONP._busy = true;
 			},
 			
 			cancel : function(){
-				X_NET_JSONPWrapper.reset();
-				X_NET_JSONPWrapper._canceled = true;
+				X_JSONP.reset();
+				X_JSONP._canceled = true;
 			},
 			
 			reset : function(){
-				X_NET_JSONPWrapper._busy = X_NET_JSONPWrapper._canceled = false;
-				X_NET_JSONPWrapper[ 'unlisten' ]( [ 'ninjaload', 'ninjaerror' ], X_NET_JSONP_iframeListener );
-				X_NET_JSONPWrapper[ 'refresh' ]( '' );
-				X_Net_JSONP_errorTimerID && X_Timer_remove( X_Net_JSONP_errorTimerID );
-				X_Net_JSONP_errorTimerID = X_Net_JSONP_onloadCount = 0;
+				X_JSONP._busy = X_JSONP._canceled = false;
+				X_JSONP[ 'unlisten' ]( [ 'ninjaload', 'ninjaerror' ], X_JSONP_iframeListener );
+				X_JSONP[ 'refresh' ]( '' );
+				X_JSONP_errorTimerID && X_Timer_remove( X_JSONP_errorTimerID );
+				X_JSONP_errorTimerID = X_JSONP_onloadCount = 0;
 			}
 		};
 
-function X_NET_JSONP_iframeListener( e ){
+function X_JSONP_iframeListener( e ){
 	switch( e.type ){
 		case 'ninjaload' :
-			console.log( 'iframe onload, but ' + X_Net_JSONP_onloadCount + ' < ' + X_Net_JSONP_maxOnloadCount );
-			if( ++X_Net_JSONP_onloadCount < X_Net_JSONP_maxOnloadCount ) return;
+			console.log( 'iframe onload, but ' + X_JSONP_onloadCount + ' < ' + X_JSONP_maxOnloadCount );
+			if( ++X_JSONP_onloadCount < X_JSONP_maxOnloadCount ) return;
 			
 			// TODO callback が無ければ error -> timeout を観る?
-			X_Net_JSONP_errorTimerID = X_NET_JSONPWrapper[ 'asyncDispatch' ]( 1000, X_EVENT_ERROR );
+			X_JSONP_errorTimerID = X_JSONP[ 'asyncDispatch' ]( 1000, X_EVENT_ERROR );
 			break;
 		case 'ninjaerror' :
 			console.log( 'iframe onerror' );
-			X_NET_JSONPWrapper[ 'asyncDispatch' ]( X_EVENT_ERROR );
+			X_JSONP[ 'asyncDispatch' ]( X_EVENT_ERROR );
 			break;
 	};
 	return X_CALLBACK_UN_LISTEN;