From: Michael Dale <dale@users.mediawiki.org>
Date: Tue, 3 Nov 2009 06:57:47 +0000 (+0000)
Subject: * added more broad java detection ( look for both navigator.javaEnabled(); & 'applica... 
X-Git-Tag: 1.31.0-rc.0~38995
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=ccd4d5c5ef725968e07554acacdffb289bbaac5e;p=lhc%2Fweb%2Fwiklou.git

* added more broad java detection ( look for both navigator.javaEnabled(); & 'application/x-java-applet'  mime )
---

diff --git a/js2/mwEmbed/libEmbedVideo/embedVideo.js b/js2/mwEmbed/libEmbedVideo/embedVideo.js
index 55a367bc5c..05478c6522 100644
--- a/js2/mwEmbed/libEmbedVideo/embedVideo.js
+++ b/js2/mwEmbed/libEmbedVideo/embedVideo.js
@@ -2495,10 +2495,10 @@ var embedTypes = {
 		
 		 // ActiveX plugins
 		 if($j.browser.msie){
-			  // check for flash		 
-			   if ( this.testActiveX( 'ShockwaveFlash.ShockwaveFlash')){				   
-				   //try to get the flash version for omtk include: 
-				   try {
+			// check for flash		 
+			if ( this.testActiveX( 'ShockwaveFlash.ShockwaveFlash')){				   
+				//try to get the flash version for omtk include: 
+				try {
 					a = new ActiveXObject(SHOCKWAVE_FLASH_AX + ".7");
 					d = a.GetVariable("$version");	// Will crash fp6.0.21/23/29
 					if (d) {
@@ -2506,15 +2506,15 @@ var embedTypes = {
 						//we need flash version 10 or greater:
 						if(parseInt( d[0]) >=10){
 							this.players.addPlayer( omtkPlayer );
-						}
-						
+						}					
 					}					
-				}catch(e) {}				
-				
-				   //flowplayer has pretty good compatiablity 
-				   // (but if we wanted to be fancy we would check for version of flash and update the mp4/h.264 support
-				   this.players.addPlayer( flowPlayer );				   
-			   }
+				}catch(e) {
+					//failed to check for flash
+				}				
+				//flowplayer has pretty good compatiablity 
+				// (but if we wanted to be fancy we would check for version of flash and update the mp4/h.264 support
+				this.players.addPlayer( flowPlayer );				   
+			}
 			 // VLC
 			 if ( this.testActiveX( 'VideoLAN.VLCPlugin.2' ) )
 				 this.players.addPlayer(vlcActiveXPlayer);
@@ -2570,7 +2570,7 @@ var embedTypes = {
 					continue;
 				}
 		
-				if ( javaEnabled && type == 'application/x-java-applet' ) {
+				if ( javaEnabled || type == 'application/x-java-applet' ) {
 					this.players.addPlayer(cortadoPlayer);
 					continue;
 				}