Merge branch '090-java-detection' into mconf-live0.6.2

2015-02-03 17:08:59 -02:00 · 2015-02-03 17:08:59 -02:00 · 4b683e9bd1
commit 4b683e9bd1
parent e8f4e55d5f 0bd0a8b30b
2 changed files with 1 additions and 1319 deletions
--- a/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
@ -49,7 +49,6 @@ var isJavaEnabled = function() {

 var isJavaVersionAppropriateForDeskshare = function() {
    var required = '1.7.0_51+';
-    deployJava.init();
    return deployJava.versionCheck(required);
 }

--- a/bigbluebutton-client/resources/prod/lib/deployJava.js
+++ b/bigbluebutton-client/resources/prod/lib/deployJava.js