X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F03_plugin%2F00_XPlugin.js;h=ffcdedc249c044987e6a86a52f7efe3edd8fbb0d;hb=3c07e12e13272820cedf983e0d9fe46e5f0a4bd9;hp=cac6fa87f2c71cc7478154a1fa2b47564f15b787;hpb=ada5c01a35945aced14a0f6b159035cf76668670;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/03_plugin/00_XPlugin.js b/0.6.x/js/03_plugin/00_XPlugin.js
index cac6fa8..ffcdedc 100644
--- a/0.6.x/js/03_plugin/00_XPlugin.js
+++ b/0.6.x/js/03_plugin/00_XPlugin.js
@@ -25,10 +25,6 @@ var X_Pulgin_FLASH_VERSION =
 			})() :
 			0,
 
-	X_Pulgin_FLASH_ENABLED =
-		X_UA[ 'ActiveX' ] ? !!X_Pulgin_FLASH_VERSION :
-			X_Object_find( navigator, 'mimeTypes>application/x-shockwave-flash>enabledPlugin' ),
-
 /*
  * ie11 の 互換モード(8,7)では、Silverlight が動作しない?
  */
@@ -36,7 +32,7 @@ var X_Pulgin_FLASH_VERSION =
 		!X_UA[ 'IE' ] || !X_UA[ 'ActiveX' ] ? parseFloat( X_Object_find( navigator, 'plugins>Silverlight Plug-In>version' ) || 0 ) :
 		X_UA[ 'ActiveX' ] && 6 <= X_UA[ 'IE' ] ? (function(){
 			    var obj = X_Script_createActiveXObjectSafty( 'AgControl.AgControl' ),
-			    	i = obj ? 5 : 0, f;
+			    	i = obj ? 5 : 0;
 
 			    for( ; i; --i ){
 			    	if( obj[ 'IsVersionSupported' ]( i + '.0' ) ) return i;
@@ -45,10 +41,6 @@ var X_Pulgin_FLASH_VERSION =
 			})() :
 			0,
 
-	X_Pulgin_SILVER_LIGHT_ENABLED =
-		X_UA[ 'ActiveX' ] ? !!X_Pulgin_SILVER_LIGHT_VERSION :
-			X_Object_find( navigator, 'mimeTypes>application/x-silverlight>enabledPlugin' ),
-
 //http://docs.unity3d.ru/Manual/Detecting%20the%20Unity%20Web%20Player%20using%20browser%20scripting.html
 	X_Pulgin_UNITY_VERSION =	
 		!X_UA[ 'IE' ] || !X_UA[ 'ActiveX' ] ?
@@ -56,15 +48,11 @@ var X_Pulgin_FLASH_VERSION =
 		!X_UA[ 'IE4' ] && !X_UA[ 'IE5' ] && X_UA[ 'ActiveX' ] ? (function(){
 			    var obj = X_Script_createActiveXObjectSafty( 'UnityWebPlayer.UnityWebPlayer.1' );
 			    
-			    console.log( obj && obj[ 'GetPluginVersion' ]() );
+			    //console.log( obj && obj[ 'GetPluginVersion' ]() );
 			    return obj ? parseFloat( obj[ 'GetPluginVersion' ]() ) : 0;
 			})() :
 			0,
 
-	X_Pulgin_UNITY_ENABLED =
-		X_UA[ 'ActiveX' ] ? !!X_Pulgin_UNITY_VERSION :
-			X_Object_find( navigator, 'mimeTypes>application/vnd.unity>enabledPlugin' ),
-
 	X_Pulgin_GEARS_ENABLED =
 		window.GearsFactory ||
 		( X_UA[ 'ActiveX' ] && 6 <= X_UA[ 'IE' ] ?
@@ -72,8 +60,20 @@ var X_Pulgin_FLASH_VERSION =
 			    return X_Script_createActiveXObjectSafty( 'Gears.Factory' );
 			})() :
 			X_Object_find( navigator, 'mimeTypes>application/x-googlegears>enabledPlugin' )
-		);
-	
+		),
+
+// https://support.microsoft.com/ja-jp/kb/279022
+// Windows Media Player 7 がクライアントにインストールされている場合に、自動的に Web ページに埋め込む方法
+// TODO GeckoActiveXObject
+	X_Pulgin_WMP_VERSION =	
+		!X_UA[ 'IE' ] || !X_UA[ 'ActiveX' ] ? parseFloat( X_Object_find( navigator, 'plugins>Windows Media Player Plug-in Dynamic Link Library>version' ) || 0 ) :
+		(function(){
+			    var obj = X_Script_createActiveXObjectSafty( 'WMPlayer.OCX.7' );
+
+			    return obj ? parseFloat( obj[ 'versionInfo' ] ) :
+			    	X_Script_createActiveXObjectSafty( '{22D6F312-B0F6-11D0-94AB-0080C74C7E95}' ) ? 6.4 : 0;
+			})();
+
 	// QuickTime Plug-in 7.7.6
 	/*
 	X_Pulgin_QUICKTIME_VERSION =
@@ -91,27 +91,24 @@ var X_Pulgin_FLASH_VERSION =
 				})() :
 				0, */
 
-
 /**
  * @namespace X.Pulgin
  */
 X[ 'Pulgin' ] = {
 	
-	'Flash'              : X_Pulgin_FLASH_VERSION,
+	'Flash'       : X_Pulgin_FLASH_VERSION,
 
-	'FlashEnabled'       : X_Pulgin_FLASH_ENABLED,
+	// FlashLite
 
-	'Silverlight'        : X_Pulgin_SILVER_LIGHT_VERSION,
-	
-	'SilverlightEnabled' : X_Pulgin_SILVER_LIGHT_ENABLED,
+	'Silverlight' : X_Pulgin_SILVER_LIGHT_VERSION,
 	
-	'Unity'              : X_Pulgin_UNITY_VERSION,
-	
-	'UnityEnabled'       : X_Pulgin_UNITY_ENABLED,
+	'Unity'       : X_Pulgin_UNITY_VERSION,
 	
 	//'QuickTime'          : X_Pulgin_QUICKTIME_VERSION,
 	
-	'GearsEnabled'       : !!X_Pulgin_GEARS_ENABLED
+	'Gears'       : !!X_Pulgin_GEARS_ENABLED,
+	
+	'WMP'         : X_Pulgin_WMP_VERSION
 	
 };