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

feat(close) Add promotional close page

This commit is contained in:
Tudor-Ovidiu Avram 2020-03-12 15:53:59 +02:00 committed by Saúl Ibarra Corretgé
parent 401003b907
commit 0289a93e5a
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
interface_config.js
View File

@ -74,6 +74,7 @@ var interfaceConfig = {
// A html text to be shown to guests on the close page, false disables it // A html text to be shown to guests on the close page, false disables it
CLOSE_PAGE_GUEST_HINT: false, CLOSE_PAGE_GUEST_HINT: false,
SHOW_PROMOTIONAL_CLOSE_PAGE: false,
RANDOM_AVATAR_URL_PREFIX: false, RANDOM_AVATAR_URL_PREFIX: false,
RANDOM_AVATAR_URL_SUFFIX: false, RANDOM_AVATAR_URL_SUFFIX: false,
FILM_STRIP_MAX_HEIGHT: 120, FILM_STRIP_MAX_HEIGHT: 120,

18
react/features/app/actions.js
View File

@ -30,6 +30,8 @@ import {
import logger from './logger'; import logger from './logger';
declare var APP: Object; declare var APP: Object;
declare var interfaceConfig: Object;
/** /**
* Triggers an in-app navigation to a specific route. Allows navigation to be * Triggers an in-app navigation to a specific route. Allows navigation to be
@ -171,7 +173,7 @@ export function redirectToStaticPage(pathname: string) {
// fine but pointless to include it because contextRoot is the current // fine but pointless to include it because contextRoot is the current
// directory. // directory.
newPathname.startsWith('./') newPathname.startsWith('./')
&& (newPathname = newPathname.substring(2)); && (newPathname = newPathname.substring(2));
newPathname = getLocationContextRoot(windowLocation) + newPathname; newPathname = getLocationContextRoot(windowLocation) + newPathname;
} }
@ -215,7 +217,7 @@ export function reloadWithStoredParams() {
windowLocation.replace(locationURL.toString()); windowLocation.replace(locationURL.toString());
if (window.self !== window.top if (window.self !== window.top
&& locationURL.search === oldSearchString) { && locationURL.search === oldSearchString) {
// NOTE: Assuming that only the hash or search part of the URL will // NOTE: Assuming that only the hash or search part of the URL will
// be changed! // be changed!
// location.reload will not trigger redirect/reload for iframe when // location.reload will not trigger redirect/reload for iframe when
@ -254,8 +256,15 @@ export function maybeRedirectToWelcomePage(options: Object = {}) {
// to close page // to close page
window.sessionStorage.setItem('guest', isGuest); window.sessionStorage.setItem('guest', isGuest);
dispatch(redirectToStaticPage(`static/${ let path = 'close.html';
options.feedbackSubmitted ? 'close.html' : 'close2.html'}`));
if (interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) {
path = 'close3.html';
} else if (!options.feedbackSubmitted) {
path = 'close2.html';
}
dispatch(redirectToStaticPage(`static/${path}`));
return; return;
} }
@ -279,4 +288,3 @@ export function maybeRedirectToWelcomePage(options: Object = {}) {
} }
}; };
} }

0
static/close3.html Normal file
View File