瀏覽代碼

fix(vpaas): Avoid url blipping on invite dialog

master
Vlad Piersec 3 年之前
父節點
當前提交
d99bf9797d

+ 10
- 0
react/features/dynamic-branding/functions.js 查看文件

34
         return `${baseUrl}?conferenceFqn=${encodeURIComponent(fqn)}`;
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 查看文件

32
     backgroundImageUrl: '',
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
      * @public
38
      * @public
39
      * @type {boolean}
39
      * @type {boolean}

+ 2
- 1
react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js 查看文件

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

Loading…
取消
儲存