Merge branch 'fix_ring_overlay'

This commit is contained in:
Lyubomir Marinov 2016-12-04 13:28:48 -06:00
commit 137aace970
2 changed files with 14 additions and 14 deletions

View File

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

View File

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