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

Merge branch 'firefox-52-java' of github.com:pedrobmarin/bigbluebutton into mconf

Browse Source
This commit is contained in:
Felipe Cecagno 2017-05-24 14:14:34 -03:00
commit ae71ac936e
5 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -353,9 +353,10 @@ bbb.desktopPublish.sharingMessage = This is your screen being shared
bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window. bbb.desktopPublish.maximizeRestoreBtn.toolTip = You cannot maximize this window.
bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close bbb.desktopPublish.closeBtn.toolTip = Stop Sharing and Close
bbb.desktopPublish.clickBelowToShareHint = Click below to share your desktop bbb.desktopPublish.clickBelowToShareHint = Click below to share your desktop
bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. You must use a different web browser (Firefox recommended) to share your desktop. bbb.desktopPublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X
bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets. You must use a different web browser (Firefox recommended) to share your desktop. bbb.desktopPublish.chrome42UnsupportedHint = Chrome no longer supports Java Applets
bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets. You must use a different web browser (Firefox recommended) to share your desktop. bbb.desktopPublish.firefox52UnsupportedHint = Firefox no longer supports Java Applets
bbb.desktopPublish.edgePluginUnsupportedHint = Edge does not support Java Applets
bbb.desktopPublish.minimizeBtn.toolTip = Minimize bbb.desktopPublish.minimizeBtn.toolTip = Minimize
bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window bbb.desktopPublish.minimizeBtn.accessibilityName = Minimize the Desktop Sharing Publish Window
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximize the Desktop Sharing Publish Window

7
bigbluebutton-client/locale/pt_BR/bbbResources.properties
View File

@ -351,9 +351,10 @@ bbb.desktopPublish.sharingMessage = Esta é a sua tela sendo compartilhada
bbb.desktopPublish.maximizeRestoreBtn.toolTip = Você não pode maximizar esta janela. bbb.desktopPublish.maximizeRestoreBtn.toolTip = Você não pode maximizar esta janela.
bbb.desktopPublish.closeBtn.toolTip = Interromper compartilhamento de tela bbb.desktopPublish.closeBtn.toolTip = Interromper compartilhamento de tela
bbb.desktopPublish.clickBelowToShareHint = Clique abaixo para compartilhar sua tela bbb.desktopPublish.clickBelowToShareHint = Clique abaixo para compartilhar sua tela
bbb.desktopPublish.chromeOnMacUnsupportedHint = Compartilhamento de tela não é suportado atualmente no Chrome no Mac OS X. Você deve usar outro navegador web (Firefox é recomendado) para compartilhar sua tela. bbb.desktopPublish.chromeOnMacUnsupportedHint = Compartilhamento de tela não é suportado atualmente no Chrome no Mac OS X
bbb.desktopPublish.chrome42UnsupportedHint = Chrome não suporta mais Applets Java. Você deve usar um navegador web diferente (Firefox é recomendado) para compartilhar seu desktop. bbb.desktopPublish.chrome42UnsupportedHint = Chrome não suporta mais Applets Java
bbb.desktopPublish.edgePluginUnsupportedHint = Edge não suporta Applets Java. Você deve usar outro navegador web (Firefox é recomendado) para compartilhar sua tela. bbb.desktopPublish.firefox52UnsupportedHint = Firefox não suporta mais Applets Java
bbb.desktopPublish.edgePluginUnsupportedHint = Edge não suporta Applets Java
bbb.desktopPublish.minimizeBtn.toolTip = Minimizar bbb.desktopPublish.minimizeBtn.toolTip = Minimizar
bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar janela do compartilhamento de tela bbb.desktopPublish.minimizeBtn.accessibilityName = Minimizar janela do compartilhamento de tela
bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar janela do compartilhamento de tela bbb.desktopPublish.maximizeRestoreBtn.accessibilityName = Maximizar janela do compartilhamento de tela

5
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
View File

@ -33,6 +33,11 @@ package org.bigbluebutton.modules.deskshare.utils
return ((browser[0] == "Chrome") && (parseInt(browser[1]) >= 42)); return ((browser[0] == "Chrome") && (parseInt(browser[1]) >= 42));
} }
public static function isFirefox52OrHigher():Boolean {
var browser:Array = ExternalInterface.call("determineBrowser");
return ((browser[0] == "Firefox") && (parseInt(browser[1]) >= 52));
}
public static function isUsingLessThanChrome38OnMac():Boolean { public static function isUsingLessThanChrome38OnMac():Boolean {
var browser:Array = ExternalInterface.call("determineBrowser"); var browser:Array = ExternalInterface.call("determineBrowser");
return ((browser[0] == "Chrome") && (parseInt(browser[1]) <= 38) && (Capabilities.os.indexOf("Mac") >= 0)); return ((browser[0] == "Chrome") && (parseInt(browser[1]) <= 38) && (Capabilities.os.indexOf("Mac") >= 0));

2
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
View File

@ -45,7 +45,7 @@ package org.bigbluebutton.modules.deskshare.utils
return null; return null;
} else if (isJavaOk.result == "JAVA_NOT_INSTALLED") { } else if (isJavaOk.result == "JAVA_NOT_INSTALLED") {
if (!BrowserCheck.isChrome42OrHigher()) { if (!BrowserCheck.isChrome42OrHigher() || !BrowserCheck.isFirefox52OrHigher()) {
dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, ResourceUtil.getInstance().getString("bbb.clientstatus.java.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.java.notinstalled"))); dispatcher.dispatchEvent(new ClientStatusEvent(ClientStatusEvent.FAIL_MESSAGE_EVENT, ResourceUtil.getInstance().getString("bbb.clientstatus.java.title"), ResourceUtil.getInstance().getString("bbb.clientstatus.java.notinstalled")));
} }
return ResourceUtil.getInstance().getString("bbb.clientstatus.java.notinstalled"); return ResourceUtil.getInstance().getString("bbb.clientstatus.java.notinstalled");

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

@ -70,6 +70,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (javaIssue != null) { if (javaIssue != null) {
if (BrowserCheck.isChrome42OrHigher()) { if (BrowserCheck.isChrome42OrHigher()) {
setCurrentState("chrome42WarningState"); setCurrentState("chrome42WarningState");
} else if (BrowserCheck.isFirefox52OrHigher()) {
setCurrentState("firefox52WarningState");
} else { } else {
setCurrentState("javaIssueWarningState"); setCurrentState("javaIssueWarningState");
javaIssueWarningStateLbl.htmlText = javaIssue; javaIssueWarningStateLbl.htmlText = javaIssue;
@ -272,6 +274,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:VBox> </mx:VBox>
</mx:AddChild> </mx:AddChild>
</mx:State> </mx:State>
<mx:State name="firefox52WarningState">
<mx:AddChild>
<mx:VBox height="100%" width="100%" verticalAlign="middle" horizontalAlign="center">
<mx:Text id="firefox52WarningLbl" width="80%" textAlign="center" styleName="desktopShareTextStyle"
text="{ResourceUtil.getInstance().getString('bbb.desktopPublish.firefox52UnsupportedHint')}" />
</mx:VBox>
</mx:AddChild>
</mx:State>
<mx:State name="edgePluginWarningState"> <mx:State name="edgePluginWarningState">
<mx:AddChild> <mx:AddChild>
<mx:VBox height="100%" width="100%" verticalAlign="middle" horizontalAlign="center"> <mx:VBox height="100%" width="100%" verticalAlign="middle" horizontalAlign="center">