Skip to content

Commit

Permalink
feat(close) Add promotional close page
Browse files Browse the repository at this point in the history
  • Loading branch information
quitrk authored and saghul committed Mar 12, 2020
1 parent 401003b commit 0289a93
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
1 change: 1 addition & 0 deletions interface_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ var interfaceConfig = {

// A html text to be shown to guests on the close page, false disables it
CLOSE_PAGE_GUEST_HINT: false,
SHOW_PROMOTIONAL_CLOSE_PAGE: false,
RANDOM_AVATAR_URL_PREFIX: false,
RANDOM_AVATAR_URL_SUFFIX: false,
FILM_STRIP_MAX_HEIGHT: 120,
Expand Down
18 changes: 13 additions & 5 deletions react/features/app/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import {
import logger from './logger';

declare var APP: Object;
declare var interfaceConfig: Object;


/**
* Triggers an in-app navigation to a specific route. Allows navigation to be
Expand Down Expand Up @@ -171,7 +173,7 @@ export function redirectToStaticPage(pathname: string) {
// fine but pointless to include it because contextRoot is the current
// directory.
newPathname.startsWith('./')
&& (newPathname = newPathname.substring(2));
&& (newPathname = newPathname.substring(2));
newPathname = getLocationContextRoot(windowLocation) + newPathname;
}

Expand Down Expand Up @@ -215,7 +217,7 @@ export function reloadWithStoredParams() {
windowLocation.replace(locationURL.toString());

if (window.self !== window.top
&& locationURL.search === oldSearchString) {
&& locationURL.search === oldSearchString) {
// NOTE: Assuming that only the hash or search part of the URL will
// be changed!
// location.reload will not trigger redirect/reload for iframe when
Expand Down Expand Up @@ -254,8 +256,15 @@ export function maybeRedirectToWelcomePage(options: Object = {}) {
// to close page
window.sessionStorage.setItem('guest', isGuest);

dispatch(redirectToStaticPage(`static/${
options.feedbackSubmitted ? 'close.html' : 'close2.html'}`));
let path = 'close.html';

if (interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) {
path = 'close3.html';
} else if (!options.feedbackSubmitted) {
path = 'close2.html';
}

dispatch(redirectToStaticPage(`static/${path}`));

return;
}
Expand All @@ -279,4 +288,3 @@ export function maybeRedirectToWelcomePage(options: Object = {}) {
}
};
}

Empty file added static/close3.html
Empty file.

0 comments on commit 0289a93

Please sign in to comment.