BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #622 from capilkey/chrome-npapi

Browse Source 
Chrome can manually allow NPAPI until version 45, modified publish window to match
This commit is contained in:
Chad Pilkey 2015-04-23 17:26:59 -04:00
commit fad70589b3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
View File

@ -115,14 +115,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (isUsingLessThanChrome38OnMac()) {
setCurrentState("chromeOnMacWarningState");
} else if (isChrome42OrHigher()) {
setCurrentState("chrome42WarningState");
} else {
var javaIssue:String = JavaCheck.checkJava();
if (javaIssue != null) {
setCurrentState("javaIssueWarningState");
javaIssueWarningStateLbl.htmlText = javaIssue;
if (isChrome42OrHigher()) {
setCurrentState("chrome42WarningState");
} else {
setCurrentState("javaIssueWarningState");
javaIssueWarningStateLbl.htmlText = javaIssue;
}
} else {
setCurrentState("dispFullRegionControlBar");
}