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

Merge pull request #5567 from capilkey/ff60-fileupload-warning

Browse Source 
Add a 64-bit check to the Firefox 60+ upload block
This commit is contained in:
Fred Dixon 2018-05-20 12:31:26 -04:00 committed by GitHub
commit 6468ac3459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
View File

@ -121,7 +121,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
// All of the code around the "firefox60" state is just a temporary stop gap to mitigate a regression
// in file uploading in Firefox 60+
if (presentOptions.disableFirefoxF60Upload && Capabilities.os.indexOf("Windows") != -1 && BrowserCheck.isFirefox() && BrowserCheck.browserMajorVersion >= "60") {
if (presentOptions.disableFirefoxF60Upload && Capabilities.os.indexOf("Windows") != -1 &&
BrowserCheck.isFirefox() && BrowserCheck.browserMajorVersion >= "60" && BrowserCheck.isWin64()) {
currentState = "firefox60";
}
}

7
bigbluebutton-client/src/org/bigbluebutton/util/browser/BrowserCheck.as
View File

@ -19,7 +19,7 @@
package org.bigbluebutton.util.browser {
import flash.external.ExternalInterface;
import org.as3commons.lang.StringUtils;
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
@ -72,6 +72,11 @@ package org.bigbluebutton.util.browser {
public static function isPuffin46AndAbove():Boolean {
return browserName.toLowerCase() == "puffin" && String(_fullVersion).substr(0, 3) >= "4.6";
}
public static function isWin64():Boolean {
var platform:String = ExternalInterface.call("window.navigator.platform.toString");
return StringUtils.equals(platform, "Win64");
}
private static function getBrowserInfo():void {
if (ExternalInterface.available && StringUtils.isEmpty(browserName)) {