Browse Source

feat: Drop buttons tooltips specific to guests.

master
damencho 4 years ago
parent
commit
c2539bf615

+ 0
- 3
lang/main.json View File

@@ -220,7 +220,6 @@
220 220
         "kickTitle": "Ouch! {{participantDisplayName}} kicked you out of the meeting",
221 221
         "liveStreaming": "Live Streaming",
222 222
         "liveStreamingDisabledBecauseOfActiveRecordingTooltip": "Not possible while recording is active",
223
-        "liveStreamingDisabledForGuestTooltip": "Guests can't start live streaming.",
224 223
         "liveStreamingDisabledTooltip": "Start live stream disabled.",
225 224
         "lockMessage": "Failed to lock the conference.",
226 225
         "lockRoom": "Add meeting $t(lockRoomPasswordUppercase)",
@@ -255,7 +254,6 @@
255 254
         "readMore": "more",
256 255
         "recording": "Recording",
257 256
         "recordingDisabledBecauseOfActiveLiveStreamingTooltip": "Not possible while a live stream is active",
258
-        "recordingDisabledForGuestTooltip": "Guests can't start recordings.",
259 257
         "recordingDisabledTooltip": "Start recording disabled.",
260 258
         "rejoinNow": "Rejoin now",
261 259
         "remoteControlAllowedMessage": "{{user}} accepted your remote control request!",
@@ -287,7 +285,6 @@
287 285
         "shareVideoTitle": "Share a video",
288 286
         "shareYourScreen": "Share your screen",
289 287
         "shareYourScreenDisabled": "Screen sharing disabled.",
290
-        "shareYourScreenDisabledForGuest": "Guests can't screen share.",
291 288
         "startLiveStreaming": "Start live stream",
292 289
         "startRecording": "Start recording",
293 290
         "startRemoteControlErrorMessage": "An error occurred while trying to start the remote control session!",

+ 1
- 7
react/features/recording/components/LiveStream/AbstractLiveStreamButton.js View File

@@ -144,13 +144,7 @@ export function _mapStateToProps(state: Object, ownProps: Props) {
144 144
             if (!visible && !_disabled) {
145 145
                 _disabled = true;
146 146
                 visible = true;
147
-
148
-                // button and tooltip
149
-                if (state['features/base/jwt'].isGuest) {
150
-                    _tooltip = 'dialog.liveStreamingDisabledForGuestTooltip';
151
-                } else {
152
-                    _tooltip = 'dialog.liveStreamingDisabledTooltip';
153
-                }
147
+                _tooltip = 'dialog.liveStreamingDisabledTooltip';
154 148
             }
155 149
         }
156 150
     }

+ 1
- 7
react/features/recording/components/Recording/AbstractRecordButton.js View File

@@ -153,13 +153,7 @@ export function _mapStateToProps(state: Object, ownProps: Props): Object {
153 153
             if (!visible && !_disabled) {
154 154
                 _disabled = true;
155 155
                 visible = true;
156
-
157
-                // button and tooltip
158
-                if (state['features/base/jwt'].isGuest) {
159
-                    _tooltip = 'dialog.recordingDisabledForGuestTooltip';
160
-                } else {
161
-                    _tooltip = 'dialog.recordingDisabledTooltip';
162
-                }
156
+                _tooltip = 'dialog.recordingDisabledTooltip';
163 157
             }
164 158
         }
165 159
     }

+ 1
- 9
react/features/toolbox/components/web/Toolbox.js View File

@@ -1426,15 +1426,7 @@ function _mapStateToProps(state) {
1426 1426
         desktopSharingEnabled = getParticipants(state)
1427 1427
             .find(({ features = {} }) =>
1428 1428
                 String(features['screen-sharing']) === 'true') !== undefined;
1429
-
1430
-        // we want to show button and tooltip
1431
-        if (state['features/base/jwt'].isGuest) {
1432
-            desktopSharingDisabledTooltipKey
1433
-                = 'dialog.shareYourScreenDisabledForGuest';
1434
-        } else {
1435
-            desktopSharingDisabledTooltipKey
1436
-                = 'dialog.shareYourScreenDisabled';
1437
-        }
1429
+        desktopSharingDisabledTooltipKey = 'dialog.shareYourScreenDisabled';
1438 1430
     }
1439 1431
 
1440 1432
     // NB: We compute the buttons again here because if URL parameters were used to

Loading…
Cancel
Save