Pārlūkot izejas kodu

fix(vpaas): Avoid url blipping on invite dialog

master
Vlad Piersec 3 gadus atpakaļ
vecāks
revīzija
d99bf9797d

+ 10
- 0
react/features/dynamic-branding/functions.js Parādīt failu

@@ -34,3 +34,13 @@ export function getDynamicBrandingUrl(state: Object) {
34 34
         return `${baseUrl}?conferenceFqn=${encodeURIComponent(fqn)}`;
35 35
     }
36 36
 }
37
+
38
+/**
39
+ * Selector used for getting the load state of the dynamic branding data.
40
+ *
41
+ * @param {Object} state - Global state of the app.
42
+ * @returns {boolean}
43
+ */
44
+export function isDynamicBrandingDataLoaded(state: Object) {
45
+    return state['features/dynamic-branding'].customizationReady;
46
+}

+ 2
- 2
react/features/dynamic-branding/reducer.js Parādīt failu

@@ -32,8 +32,8 @@ const DEFAULT_STATE = {
32 32
     backgroundImageUrl: '',
33 33
 
34 34
     /**
35
-     * Flag indicating that the logo (JitsiWatermark) can be displayed.
36
-     * This is used in order to avoid image flickering.
35
+     * Flag indicating that the branding data can be displayed.
36
+     * This is used in order to avoid image flickering / text changing(blipping).
37 37
      *
38 38
      * @public
39 39
      * @type {boolean}

+ 2
- 1
react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js Parādīt failu

@@ -9,6 +9,7 @@ import { translate } from '../../../../base/i18n';
9 9
 import { JitsiRecordingConstants } from '../../../../base/lib-jitsi-meet';
10 10
 import { connect } from '../../../../base/redux';
11 11
 import { isVpaasMeeting } from '../../../../billing-counter/functions';
12
+import { isDynamicBrandingDataLoaded } from '../../../../dynamic-branding/functions';
12 13
 import EmbedMeetingTrigger from '../../../../embed-meeting/components/EmbedMeetingTrigger';
13 14
 import { getActiveSession } from '../../../../recording';
14 15
 import { updateDialInNumbers } from '../../../actions';
@@ -201,7 +202,7 @@ function mapStateToProps(state, ownProps) {
201 202
         _dialIn: dialIn,
202 203
         _embedMeetingVisible: !isVpaasMeeting(state) && isSharingEnabled(sharingFeatures.embed),
203 204
         _dialInVisible: isSharingEnabled(sharingFeatures.dialIn),
204
-        _urlSharingVisible: isSharingEnabled(sharingFeatures.url),
205
+        _urlSharingVisible: isDynamicBrandingDataLoaded(state) && isSharingEnabled(sharingFeatures.url),
205 206
         _emailSharingVisible: isSharingEnabled(sharingFeatures.email),
206 207
         _invitationText: getInviteText({ state,
207 208
             phoneNumber,

Notiek ielāde…
Atcelt
Saglabāt