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

feat: Drops SHOW_JITSI_WATERMARK_FOR_GUESTS and SHOW_WATERMARK_FOR_GUESTS.

This commit is contained in:
damencho 2020-11-05 08:34:43 -06:00 committed by Дамян Минков
parent c007477ee9
commit c14f639639
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
interface_config.js
View File

@ -186,7 +186,6 @@ var interfaceConfig = {
SHOW_JITSI_WATERMARK: true, SHOW_JITSI_WATERMARK: true,
SHOW_POWERED_BY: false, SHOW_POWERED_BY: false,
SHOW_PROMOTIONAL_CLOSE_PAGE: false, SHOW_PROMOTIONAL_CLOSE_PAGE: false,
SHOW_WATERMARK_FOR_GUESTS: true, // if watermark is disabled by default, it can be shown only for guests
/* /*
* If indicated some of the error dialogs may point to the support URL for * If indicated some of the error dialogs may point to the support URL for

4
react/features/base/react/components/web/Watermarks.js
View File

@ -225,7 +225,6 @@ class Watermarks extends Component<Props, State> {
* @returns {Props} * @returns {Props}
*/ */
function _mapStateToProps(state, ownProps) { function _mapStateToProps(state, ownProps) {
const { isGuest } = state['features/base/jwt'];
const { const {
customizationReady, customizationReady,
customizationFailed, customizationFailed,
@ -239,12 +238,11 @@ function _mapStateToProps(state, ownProps) {
DEFAULT_LOGO_URL, DEFAULT_LOGO_URL,
JITSI_WATERMARK_LINK, JITSI_WATERMARK_LINK,
SHOW_JITSI_WATERMARK, SHOW_JITSI_WATERMARK,
SHOW_JITSI_WATERMARK_FOR_GUESTS,
filmStripOnly filmStripOnly
} = interfaceConfig; } = interfaceConfig;
let _showJitsiWatermark = (!filmStripOnly let _showJitsiWatermark = (!filmStripOnly
&& (customizationReady && !customizationFailed) && (customizationReady && !customizationFailed)
&& (SHOW_JITSI_WATERMARK || (isGuest && SHOW_JITSI_WATERMARK_FOR_GUESTS))) && SHOW_JITSI_WATERMARK)
|| !isValidRoom; || !isValidRoom;
let _logoUrl = logoImageUrl; let _logoUrl = logoImageUrl;
let _logoLink = logoClickUrl; let _logoLink = logoClickUrl;