OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.6.112, fix X.Node.Anime, rewite X.Audio.* for AudioSprite, add X.Audio...
[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
73bdf2f
..
f3868f8
100644
(file)
--- a/
0.6.x/js/03_plugin/00_XPlugin.js
+++ b/
0.6.x/js/03_plugin/00_XPlugin.js
@@
-9,12
+9,18
@@
* flash player 10, ie6+, ff2+, safari3, opera9.5
* flash player 11, ie7+, ff4(?), safari5, opera11
* flash player 12, ie8+, ff17, opera11
* flash player 10, ie6+, ff2+, safari3, opera9.5
* flash player 11, ie7+, ff4(?), safari5, opera11
* flash player 12, ie8+, ff17, opera11
+ *
+ * http://helpx.adobe.com/jp/flash-player/kb/228683.html
+ * flash player 9, Mac 10.1-10.3, 98, ME
+ * flash player 10.1, Mac 10.4
+ * flash player 10.3, Mac 10.5
+ * flash player 11.1, Win2k, Android 2.x-4.x
*/
var X_Pulgin_FLASH_VERSION =
!X_UA.IE && navigator.plugins[ 'Shockwave Flash' ] ?
parseFloat( navigator.plugins[ 'Shockwave Flash' ].version ) :
!X_UA.IE4 && !X_UA.IE5 && X_UA.ActiveX ? (function(){
*/
var X_Pulgin_FLASH_VERSION =
!X_UA.IE && navigator.plugins[ 'Shockwave Flash' ] ?
parseFloat( navigator.plugins[ 'Shockwave Flash' ].version ) :
!X_UA.IE4 && !X_UA.IE5 && X_UA.ActiveX ? (function(){
- var obj = eval( 'var a;try{a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch(e){}a' ),
+ var obj = eval( 'var a
,e
;try{a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch(e){}a' ),
ver = obj && obj.GetVariable( '$version' ).split( ' ' ).join( '.' );
return parseFloat( ver ) || 0;
})() :
ver = obj && obj.GetVariable( '$version' ).split( ' ' ).join( '.' );
return parseFloat( ver ) || 0;
})() :
@@
-48,7
+54,7
@@
var X_Pulgin_FLASH_VERSION =
!X_UA.IE && navigator.plugins[ 'Unity Player' ] ?
parseFloat( navigator.plugins[ 'Unity Player' ].version ) :
!X_UA.IE4 && !X_UA.IE5 && X_UA.ActiveX ? (function(){
!X_UA.IE && navigator.plugins[ 'Unity Player' ] ?
parseFloat( navigator.plugins[ 'Unity Player' ].version ) :
!X_UA.IE4 && !X_UA.IE5 && X_UA.ActiveX ? (function(){
- var obj = eval( 'var a;try{a=new ActiveXObject("UnityWebPlayer.UnityWebPlayer.1")}catch(e){}a' );
+ var obj = eval( 'var a
,e
;try{a=new ActiveXObject("UnityWebPlayer.UnityWebPlayer.1")}catch(e){}a' );
return obj ? parseFloat( obj.GetPluginVersion() ) : 0;
})() :
0,
return obj ? parseFloat( obj.GetPluginVersion() ) : 0;
})() :
0,
@@
-57,20
+63,36
@@
var X_Pulgin_FLASH_VERSION =
X_UA.ActiveX ? !!X_Pulgin_UNITY_VERSION :
navigator.mimeTypes &&
navigator.mimeTypes[ 'application/vnd.unity' ] &&
X_UA.ActiveX ? !!X_Pulgin_UNITY_VERSION :
navigator.mimeTypes &&
navigator.mimeTypes[ 'application/vnd.unity' ] &&
- navigator.mimeTypes[ 'application/vnd.unity' ].enabledPlugin;
+ navigator.mimeTypes[ 'application/vnd.unity' ].enabledPlugin,
+
+ X_Pulgin_GEARS_ENABLED =
+ window.GearsFactory ||
+ ( X_UA.ActiveX && 6 <= X_UA.IE ?
+ (function(){
+ return eval( 'var a,e;try{a=new ActiveXObject("Gears.Factory")}catch(e){}!!a' );
+ })() :
+ navigator.mimeTypes &&
+ navigator.mimeTypes[ 'application/x-googlegears' ] &&
+ navigator.mimeTypes[ 'application/x-googlegears' ].enabledPlugin
+ );
X.Pulgin = {
Flash : X_Pulgin_FLASH_VERSION,
X.Pulgin = {
Flash : X_Pulgin_FLASH_VERSION,
- FlashEnabled : X_Pulgin_FLASH_ENABLED,
+ FlashEnabled :
!!
X_Pulgin_FLASH_ENABLED,
Silverlight : X_Pulgin_SILVER_LIGHT_VERSION,
Silverlight : X_Pulgin_SILVER_LIGHT_VERSION,
- SilverlightEnabled : X_Pulgin_SILVER_LIGHT_ENABLED,
+ SilverlightEnabled :
!!
X_Pulgin_SILVER_LIGHT_ENABLED,
Unity : X_Pulgin_UNITY_VERSION,
Unity : X_Pulgin_UNITY_VERSION,
- UnityEnabled : X_Pulgin_UNITY_ENABLED
+ UnityEnabled : !!X_Pulgin_UNITY_ENABLED,
+
+ GearsEnabled : X_Pulgin_GEARS_ENABLED
};
};
+
+if( X_Pulgin_GEARS_ENABLED ) alert( 'X_Pulgin_GEARS_ENABLED' );
+