From aaf4a0d8f4db2aa33f782748abeff295048fd97c Mon Sep 17 00:00:00 2001
From: passbe <passbe@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Wed, 17 Nov 2010 09:14:56 +0000
Subject: [PATCH] Have rolled back advanced java detection until the framework
 can support external asset injection. Issue #32 & Issue #155

git-svn-id: https://beef.googlecode.com/svn/trunk@536 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 demos/jvc.class           | Bin 641 -> 0 bytes
 demos/jvc.java            |  28 ----------------------------
 modules/beefjs/browser.js |  15 ++-------------
 3 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 demos/jvc.class
 delete mode 100644 demos/jvc.java

diff --git a/demos/jvc.class b/demos/jvc.class
deleted file mode 100644
index d2037932ed5e21ea43009ed38b4921037d6813b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 641
zcmZutT}uK%6g}gvx~^;4_H9{N5$Z!iJr+R(JxN4{552^igRJPTtgGOE>Y<=0dgurA
zqoOlg^kFh^@0~m6o^$TJy}!Hy*u%C714{;$P2{kWLK3S6@+z+-v7W?+K)icBl!1U<
zZ97A!(s8_2r4|OR*E;xm^aK)zuIGkF0$Q<D7tl}qrWBa2x}H26bQ?0bbQ&FYbOjSg
zx&4cQ=aD0txDqg1GOWv>@A_n$E0!jSr6P>i^y$W|`Gep_p1O+FXb*38l{*U-G6I&W
zcj;QuB~h@ji7g8$m;&jqH$`J1ty&t#xnH!N)9ZC)SUHZ8KsIWA?mX&;vP%NGI1l`u
z48oDXPVv9f3FcAYmm2)?7!Q3!6~&q3pkZVfr+CXV3)L+@LEN+8FES>grpB24hVGL}
zL1)W$>>1i4^s*g~ip0<06f{CiYNlaRM_`8eQ!B@;2x9sz<8PrXZ?l+V{Ojof`rR0G
So}l@O(8M@Y=`AQdEPen#`EE!6

diff --git a/demos/jvc.java b/demos/jvc.java
deleted file mode 100644
index 8b806365c..000000000
--- a/demos/jvc.java
+++ /dev/null
@@ -1,28 +0,0 @@
-import java.applet.Applet;
-
-public class jvc extends Applet
-{
-	private String m_ver;
-	private String m_ven;
-
-	public void init()
-	{
-		m_ver = System.getProperty("java.version");
-		m_ven = System.getProperty("java.vendor");
-	}
-
-	public boolean isRunning()
-	{
-		return true;
-	}
-
-	public String getVersion()
-	{
-		return m_ver;
-	}
-
-	public String getVendor()
-	{
-		return m_ven;
-	}
-} 
diff --git a/modules/beefjs/browser.js b/modules/beefjs/browser.js
index a84322695..7556e1493 100644
--- a/modules/beefjs/browser.js
+++ b/modules/beefjs/browser.js
@@ -242,19 +242,8 @@ beef.browser = {
 	 * @example: if(beef.browser.hasJava()) { ... }
 	 */
 	hasJava: function() {
-		if(window.navigator.javaEnabled()) {
-			var jvc = document.createElement('applet');
-			var running = false;
-			jvc.id = 'beef_jvc';
-			jvc.classid = 'jvc.class';
-			if (document.body.appendChild(jvc))
-			{
-				try {
-					running = jvc.isRunning();
-				} catch (e) {}
-				document.body.removeChild(jvc);
-			}
-			return running;
+		if(window.navigator.javaEnabled && window.navigator.javaEnabled()) {
+			return true;
 		}
 		return false;
 	},