haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into follow_me_tests

This commit is contained in:
tsareg 2016-06-08 15:58:18 +03:00
parent b0f778ab8a 346ff889ea
commit b97dfb7452
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -48,7 +48,7 @@ uglify:
source-package:
mkdir -p source_package/jitsi-meet/css && \
cp -r *.js connection_optimization favicon.ico fonts images index.html libs plugin.*html sounds title.html unsupported_browser.html LICENSE lang source_package/jitsi-meet && \
cp -r *.js *.html connection_optimization favicon.ico fonts images libs sounds LICENSE lang source_package/jitsi-meet && \
cp css/all.css source_package/jitsi-meet/css && \
cp css/unsupported_browser.css source_package/jitsi-meet/css && \
(cd source_package ; tar cjf ../jitsi-meet.tar.bz2 jitsi-meet) && \

3
conference.js
View File

@ -1178,7 +1178,8 @@ export default {
if(config.debug)
{
this.audioLevelsMap[id] = lvl;
console.log("AudioLevel:" + id + "/" + lvl);
if(config.debugAudioLevels)
console.log("AudioLevel:" + id + "/" + lvl);
}
APP.UI.setAudioLevel(id, lvl);

5
external_api.js
View File

@ -25,10 +25,11 @@ var JitsiMeetExternalAPI = (function()
* @param parent_node the node that will contain the iframe
* @param filmStripOnly if the value is true only the small videos will be
* visible.
* @param noSsl if the value is true https won't be used
* @constructor
*/
function JitsiMeetExternalAPI(domain, room_name, width, height, parentNode,
configOverwrite, interfaceConfigOverwrite) {
configOverwrite, interfaceConfigOverwrite, noSsl) {
if (!width || width < MIN_WIDTH)
width = MIN_WIDTH;
if (!height || height < MIN_HEIGHT)
@ -50,7 +51,7 @@ var JitsiMeetExternalAPI = (function()
if(height)
this.iframeHolder.style.height = height + "px";
this.frameName = "jitsiConferenceFrame" + JitsiMeetExternalAPI.id;
this.url = "//" + domain + "/";
this.url = (noSsl) ? "http" : "https" +"://" + domain + "/";
if(room_name)
this.url += room_name;
this.url += "#external=true";

10
modules/FollowMe.js
View File

@ -154,9 +154,10 @@ class FollowMe {
this._nextOnStage(smallVideo, isPinned);
this._sharedDocumentToggled
.bind(this, this._UI.getSharedDocumentManager().isVisible());
// check whether shared document is enabled/initialized
if(this._UI.getSharedDocumentManager())
this._sharedDocumentToggled
.bind(this, this._UI.getSharedDocumentManager().isVisible());
}
/**
@ -352,10 +353,13 @@ class FollowMe {
_onNextOnStage(id) {
var clickId = null;
var pin;
// if there is an id which is not pinned we schedule it for pin only the
// first time
if(typeof id !== 'undefined' && !VideoLayout.isPinned(id)) {
clickId = id;
pin = true;
}
// if there is no id, but we have a pinned one, let's unpin
else if (typeof id == 'undefined' && VideoLayout.getPinnedId()) {
clickId = VideoLayout.getPinnedId();
pin = false;