Browse Source

feat: Drops SHOW_JITSI_WATERMARK_FOR_GUESTS and SHOW_WATERMARK_FOR_GUESTS.

master
damencho 5 years ago
parent
commit
c14f639639
2 changed files with 1 additions and 4 deletions
  1. 0
    1
      interface_config.js
  2. 1
    3
      react/features/base/react/components/web/Watermarks.js

+ 0
- 1
interface_config.js View File

186
     SHOW_JITSI_WATERMARK: true,
186
     SHOW_JITSI_WATERMARK: true,
187
     SHOW_POWERED_BY: false,
187
     SHOW_POWERED_BY: false,
188
     SHOW_PROMOTIONAL_CLOSE_PAGE: false,
188
     SHOW_PROMOTIONAL_CLOSE_PAGE: false,
189
-    SHOW_WATERMARK_FOR_GUESTS: true, // if watermark is disabled by default, it can be shown only for guests
190
 
189
 
191
     /*
190
     /*
192
      * If indicated some of the error dialogs may point to the support URL for
191
      * If indicated some of the error dialogs may point to the support URL for

+ 1
- 3
react/features/base/react/components/web/Watermarks.js View File

225
  * @returns {Props}
225
  * @returns {Props}
226
  */
226
  */
227
 function _mapStateToProps(state, ownProps) {
227
 function _mapStateToProps(state, ownProps) {
228
-    const { isGuest } = state['features/base/jwt'];
229
     const {
228
     const {
230
         customizationReady,
229
         customizationReady,
231
         customizationFailed,
230
         customizationFailed,
239
         DEFAULT_LOGO_URL,
238
         DEFAULT_LOGO_URL,
240
         JITSI_WATERMARK_LINK,
239
         JITSI_WATERMARK_LINK,
241
         SHOW_JITSI_WATERMARK,
240
         SHOW_JITSI_WATERMARK,
242
-        SHOW_JITSI_WATERMARK_FOR_GUESTS,
243
         filmStripOnly
241
         filmStripOnly
244
     } = interfaceConfig;
242
     } = interfaceConfig;
245
     let _showJitsiWatermark = (!filmStripOnly
243
     let _showJitsiWatermark = (!filmStripOnly
246
           && (customizationReady && !customizationFailed)
244
           && (customizationReady && !customizationFailed)
247
-          && (SHOW_JITSI_WATERMARK || (isGuest && SHOW_JITSI_WATERMARK_FOR_GUESTS)))
245
+          && SHOW_JITSI_WATERMARK)
248
     || !isValidRoom;
246
     || !isValidRoom;
249
     let _logoUrl = logoImageUrl;
247
     let _logoUrl = logoImageUrl;
250
     let _logoLink = logoClickUrl;
248
     let _logoLink = logoClickUrl;

Loading…
Cancel
Save