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

Merge pull request #2729 from riadvice/puffin-browser

Browse Source 
Puffin browser detection
This commit is contained in:
Richard Alam 2015-08-19 10:49:26 -04:00
commit ebad2dba97
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigbluebutton-client/resources/prod/lib/bbb_blinker.js
View File

@ -73,6 +73,11 @@ function determineBrowser()
browserName = "Microsoft Internet Explorer";
fullVersion = nAgt.substring(verOffset+5);
}
// In Puffin, the true version is after "Puffin" in userAgent
else if ((verOffset=nAgt.indexOf("Puffin"))!=-1) {
browserName = "Puffin";
fullVersion = nAgt.substring(verOffset+7);
}
// In Chrome, the true version is after "Chrome"
else if ((verOffset=nAgt.indexOf("Chrome"))!=-1) {
browserName = "Chrome";

9
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
View File

@ -71,6 +71,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
vboxMic.percentWidth = 50;
vboxListen.percentWidth = 50;
}
// If Puffin browser is deteted
if (ExternalInterface.call("determineBrowser")[0] == "Puffin") {
vruleListen.visible = vruleListen.includeInLayout = vboxMic.visible = vboxMic.includeInLayout = false;
vboxListen.percentWidth = 100;
if (!phoneOptions.showPhoneOption) {
this.width = this.width/2;
}
}
}
private function onMicClick():void {

8
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/model/DeskshareOptions.as
View File

@ -18,6 +18,8 @@
*/
package org.bigbluebutton.modules.deskshare.model
{
import flash.external.ExternalInterface;
import org.bigbluebutton.core.BBB;
public class DeskshareOptions
@ -52,7 +54,11 @@ package org.bigbluebutton.modules.deskshare.model
baseTabIndex = 201;
}
if (vxml.@showButton != undefined){
showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;
showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;
// If we are using Puffin browser
if (ExternalInterface.call("determineBrowser")[0] == "Puffin") {
showButton = false;
}
}
}
}

12
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/model/VideoConfOptions.as
View File

@ -18,6 +18,8 @@
*/
package org.bigbluebutton.modules.videoconf.model
{
import flash.external.ExternalInterface;
import org.bigbluebutton.core.BBB;
public class VideoConfOptions
@ -97,6 +99,10 @@ package org.bigbluebutton.modules.videoconf.model
}
if (vxml.@showButton != undefined) {
showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;
// If we are using Puffin browser
if (ExternalInterface.call("determineBrowser")[0] == "Puffin") {
showButton = false;
}
}
if (vxml.@autoStart != undefined) {
autoStart = (vxml.@autoStart.toString().toUpperCase() == "TRUE") ? true : false;
@ -113,9 +119,9 @@ package org.bigbluebutton.modules.videoconf.model
if (vxml.@viewerWindowMaxed != undefined) {
viewerWindowMaxed = (vxml.@viewerWindowMaxed.toString().toUpperCase() == "TRUE") ? true : false;
}
if (vxml.@skipCamSettingsCheck != undefined) {
skipCamSettingsCheck = (vxml.@skipCamSettingsCheck.toString().toUpperCase() == "TRUE") ? true : false;
}
if (vxml.@skipCamSettingsCheck != undefined) {
skipCamSettingsCheck = (vxml.@skipCamSettingsCheck.toString().toUpperCase() == "TRUE") ? true : false;
}
if (vxml.@viewerWindowLocation != undefined) {
viewerWindowLocation = vxml.@viewerWindowLocation.toString().toUpperCase();
}