From 0f98d922bfb5ea24a9a436ccc56113e873027c38 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Fri, 12 Apr 2013 10:08:48 +0000
Subject: [PATCH] - add some checks for java
---
.../resources/prod/check/bbb-check.html | 7 ++++++-
.../resources/prod/check/lib/bbb_check.js | 18 ++++++++++++++++++
.../prod/check/lib/pre_flight_check.js | 8 ++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/bigbluebutton-client/resources/prod/check/bbb-check.html b/bigbluebutton-client/resources/prod/check/bbb-check.html
index 26e6bed466..d6d8304790 100755
--- a/bigbluebutton-client/resources/prod/check/bbb-check.html
+++ b/bigbluebutton-client/resources/prod/check/bbb-check.html
@@ -19,7 +19,9 @@
<script type="text/javascript" src="lib/bbb_check.js" language="javascript"></script>
<script type="text/javascript" src="lib/pre_flight_check.js" language="javascript"></script>
<script>
-
+ var testJava = function() {
+ window.open("http://www.java.com/en/download/testjava.jsp")
+ }
</script>
</head>
@@ -27,6 +29,9 @@
<div id="controls">
<button type="button" onclick="bbbCheckFlashVersion()">Check Flash Version</button>
<button type="button" onclick="bbbHasMinFlashVersion('9.0.18')">Min Version</button>
+ <button type="button" onclick="bbbGetBrowser()">Get browser</button>
+ <button type="button" onclick="bbbGetJREs()">Get JREs</button>
+ <button type="button" onclick="testJava()">test Java</button>
</div>
</body>
</html>
diff --git a/bigbluebutton-client/resources/prod/check/lib/bbb_check.js b/bigbluebutton-client/resources/prod/check/lib/bbb_check.js
index 5e95a5b071..7a711309c7 100755
--- a/bigbluebutton-client/resources/prod/check/lib/bbb_check.js
+++ b/bigbluebutton-client/resources/prod/check/lib/bbb_check.js
@@ -10,7 +10,25 @@
return swfobject.hasFlashPlayerVersion(flashVersion);
}
+ BBBCheck.getBrowser = function() {
+ return deployJava.getBrowser();
+ }
+
+ BBBCheck.getJREs = function() {
+ return deployJava.getJREs();
+ }
+
+ BBBCheck.installJRE = function(version) {
+ deployJava.installJRE(version);
+ }
+
+ BBBCheck.installLatestJRE = function() {
+ deployJava.installLatestJRE();
+ }
+ BBBCheck.runApplet = function(attributes, parameters, minimumVersion) {
+ deployJava.runApplet(attributes, parameters, minimumVersion);
+ }
window.BBBCheck = BBBCheck;
})(this);
diff --git a/bigbluebutton-client/resources/prod/check/lib/pre_flight_check.js b/bigbluebutton-client/resources/prod/check/lib/pre_flight_check.js
index 37b90fb606..8529671662 100755
--- a/bigbluebutton-client/resources/prod/check/lib/pre_flight_check.js
+++ b/bigbluebutton-client/resources/prod/check/lib/pre_flight_check.js
@@ -6,4 +6,12 @@ var bbbCheckFlashVersion = function() {
var bbbHasMinFlashVersion = function(version) {
console.log("Q: Do I have Flash player 9.0.18 or higher installed?\nA: " + BBBCheck.hasMinFlashPlayerVersion(version));
+}
+
+var bbbGetBrowser = function() {
+ console.log("Browser = " + BBBCheck.getBrowser());
+}
+
+var bbbGetJREs = function() {
+ console.log("JREs = " + BBBCheck.getJREs());
}
\ No newline at end of file
--
GitLab