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

Merge branch 'fix_ring_overlay'

This commit is contained in:
Lyubomir Marinov 2016-12-04 13:28:48 -06:00
parent fd24595baf 23efa7827c
commit 137aace970
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/UI/UI.js
View File

@ -1400,13 +1400,13 @@ UI.setMicrophoneButtonEnabled = function (enabled) {
UI.showRingOverlay = function () { UI.showRingOverlay = function () {
RingOverlay.show(APP.tokenData.callee, interfaceConfig.DISABLE_RINGING); RingOverlay.show(APP.tokenData.callee, interfaceConfig.DISABLE_RINGING);
FilmStrip.toggleFilmStrip(false); FilmStrip.toggleFilmStrip(false, false);
}; };
UI.hideRingOverLay = function () { UI.hideRingOverLay = function () {
if (!RingOverlay.hide()) if (!RingOverlay.hide())
return; return;
FilmStrip.toggleFilmStrip(true); FilmStrip.toggleFilmStrip(true, false);
}; };
/** /**

24
modules/UI/videolayout/FilmStrip.js
View File

@ -114,30 +114,34 @@ const FilmStrip = {
* of the film strip. If not specified, the visibility will be flipped * of the film strip. If not specified, the visibility will be flipped
* (i.e. toggled); otherwise, the visibility will be set to the specified * (i.e. toggled); otherwise, the visibility will be set to the specified
* value. * value.
* @param {Boolean} sendAnalytics - True to send an analytics event. The
* default value is true.
* *
* Note: * Note:
* This method shouldn't be executed directly to hide the filmstrip. * This method shouldn't be executed directly to hide the filmstrip.
* It's important to hide the filmstrip with UI.toggleFilmstrip in order * It's important to hide the filmstrip with UI.toggleFilmstrip in order
* to correctly resize the video area. * to correctly resize the video area.
*/ */
toggleFilmStrip(visible) { toggleFilmStrip(visible, sendAnalytics = true) {
let isVisibleDefined = typeof visible === 'boolean'; const isVisibleDefined = typeof visible === 'boolean';
if (!isVisibleDefined) { if (!isVisibleDefined) {
visible = this.isFilmStripVisible(); visible = this.isFilmStripVisible();
} else if (this.isFilmStripVisible() === visible) { } else if (this.isFilmStripVisible() === visible) {
return; return;
} }
JitsiMeetJS.analytics.sendEvent('toolbar.filmstrip.toggled'); if (sendAnalytics) {
JitsiMeetJS.analytics.sendEvent('toolbar.filmstrip.toggled');
}
this.filmStrip.toggleClass("hidden"); this.filmStrip.toggleClass("hidden");
if (!visible) { if (visible) {
this.showMenuDownIcon();
} else {
this.showMenuUpIcon(); this.showMenuUpIcon();
} else {
this.showMenuDownIcon();
} }
// Emit/fire UIEvents.TOGGLED_FILM_STRIP. // Emit/fire UIEvents.TOGGLED_FILM_STRIP.
var eventEmitter = this.eventEmitter; const eventEmitter = this.eventEmitter;
if (eventEmitter) { if (eventEmitter) {
eventEmitter.emit( eventEmitter.emit(
UIEvents.TOGGLED_FILM_STRIP, UIEvents.TOGGLED_FILM_STRIP,
@ -372,9 +376,7 @@ const FilmStrip = {
* @param forceUpdate * @param forceUpdate
* @returns {Promise} * @returns {Promise}
*/ */
resizeThumbnails(local, remote, resizeThumbnails(local, remote, animate = false, forceUpdate = false) {
animate = false, forceUpdate = false) {
return new Promise(resolve => { return new Promise(resolve => {
let thumbs = this.getThumbs(!forceUpdate); let thumbs = this.getThumbs(!forceUpdate);
let promises = []; let promises = [];
@ -455,9 +457,7 @@ const FilmStrip = {
} else { } else {
return { remoteThumbs, localThumb }; return { remoteThumbs, localThumb };
} }
} }
}; };
export default FilmStrip; export default FilmStrip;