Version 0.6.176, add X.Script.

[pettanr/clientJs.git] / 0.6.x / js / 03_plugin / 00_XPlugin.js

diff --git a/0.6.x/js/03_plugin/00_XPlugin.js b/0.6.x/js/03_plugin/00_XPlugin.js
index 961f638..6be1a47 100644 (file)
--- a/0.6.x/js/03_plugin/00_XPlugin.js
+++ b/0.6.x/js/03_plugin/00_XPlugin.js
@@ -19,7 +19,7 @@
 var X_Pulgin_FLASH_VERSION =
                !X_UA[ 'IE' ] || !X_UA[ 'ActiveX' ] ? parseFloat( X_Object_find( navigator, 'plugins>Shockwave Flash>version' ) || 0 ) :
                !X_UA[ 'IE4' ] && !X_UA[ 'IE5' ] && X_UA[ 'ActiveX' ] ? (function(){
-                           var obj = eval( 'var a,e;try{a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch(e){}a' ),
+                           var obj = X_Script_createActiveXObjectSafty( 'ShockwaveFlash.ShockwaveFlash' ),
                                ver = obj && obj[ 'GetVariable' ]( '$version' ).split( ' ' ).join( '.' );
                                return parseFloat( ver ) || 0;
                        })() :
@@ -35,7 +35,13 @@ var X_Pulgin_FLASH_VERSION =
        X_Pulgin_SILVER_LIGHT_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(){
-                           return eval( 'var a,i=0;try{a=new ActiveXObject("AgControl.AgControl");for(i=5;i;--i)if(a.IsVersionSupported(i+".0"))break;}catch(e){i=0}i' );
+                           var obj = X_Script_createActiveXObjectSafty( 'AgControl.AgControl' ),
+                               i = obj ? 5 : 0, f;
+
+                           for( ; i; --i ){
+                               if( obj[ 'IsVersionSupported' ]( i + '.0' ) ) return i;
+                           };
+                           return 0;
                        })() :
                        0,
 
@@ -48,7 +54,7 @@ var X_Pulgin_FLASH_VERSION =
                !X_UA[ 'IE' ] || !X_UA[ 'ActiveX' ] ?
                        parseFloat( X_Object_find( navigator, 'plugins>Unity Player>version' ) || 0 ) :
                !X_UA[ 'IE4' ] && !X_UA[ 'IE5' ] && X_UA[ 'ActiveX' ] ? (function(){
-                           var obj = eval( 'var a,e;try{a=new ActiveXObject("UnityWebPlayer.UnityWebPlayer.1")}catch(e){}a' );
+                           var obj = X_Script_createActiveXObjectSafty( 'UnityWebPlayer.UnityWebPlayer.1' );
                            return obj ? parseFloat( obj[ 'GetPluginVersion' ]() ) : 0;
                        })() :
                        0,
@@ -61,10 +67,10 @@ var X_Pulgin_FLASH_VERSION =
                window.GearsFactory ||
                ( X_UA[ 'ActiveX' ] && 6 <= X_UA[ 'IE' ] ?
                        (function(){
-                           return eval( 'var a,e;try{a=new ActiveXObject("Gears.Factory")}catch(e){}!!a' );
+                           return X_Script_createActiveXObjectSafty( 'Gears.Factory' );
                        })() :
                        X_Object_find( navigator, 'mimeTypes>application/x-googlegears>enabledPlugin' )
-               ),
+               );
        
        // QuickTime Plug-in 7.7.6
        /*
@@ -76,15 +82,12 @@ var X_Pulgin_FLASH_VERSION =
                                return 0;
                        })( navigator.plugins ) :
                        !X_UA[ 'IE4' ] && !X_UA[ 'IE5' ] && X_UA[ 'ActiveX' ] ? (function(){
-                                   var obj = eval( 'var a,e;try{a=new ActiveXObject("QuickTimeCheckObject.QuickTimeCheck.1")}catch(e){}a' ),
+                                   var obj = QuickTimeCheckObject.QuickTimeCheck.1' ),
                                        ver = obj && obj[ 'QuickTimeVersion' ].toString( 16 );
 
                                        return ver ? parseFloat( ver.substr( 0, 3 ) ) / 100 : 0;
                                })() :
                                0, */
-       
-       X_Pulgin_VBS_ENABLED =
-               X_UA[ 'Windows' ] && !X_UA[ 'WinCE' ] && X_UA[ 'IE' ] < 11;
 
 
 /**