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

Merge pull request #924 from jitsi/add-close-page 

Adds close page
This commit is contained in:
yanas 2016-09-22 16:20:14 -05:00 committed by GitHub
parent 7eb85fe7aa 9cb0723f8d
commit 06247266ad
6 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
close.html Normal file
View File

@ -0,0 +1,8 @@
<html>
<head>
<link rel="stylesheet" href="css/all.css"/>
</head>
<body>
<div class="closeMessage">Thank you for your feedback!</div>
</body>
</html>

22
conference.js
View File

@ -202,8 +202,28 @@ function muteLocalVideo (muted) {
/** /**
* Check if the welcome page is enabled and redirects to it. * Check if the welcome page is enabled and redirects to it.
* If requested show a thank you dialog before that.
* If we have a close page enabled, redirect to it without
* showing any other dialog.
* @param {boolean} showThankYou whether we should show a thank you dialog
*/ */
function maybeRedirectToWelcomePage() { function maybeRedirectToWelcomePage(showThankYou) {
// if close page is enabled redirect to it, without further action
if (config.enableClosePage) {
window.location.pathname = "close.html";
return;
}
if (showThankYou) {
APP.UI.messageHandler.openMessageDialog(
null, null, null,
APP.translation.translateString(
"dialog.thankYou", {appName:interfaceConfig.APP_NAME}
)
);
}
if (!config.enableWelcomePage) { if (!config.enableWelcomePage) {
return; return;
} }

2
config.js
View File

@ -56,6 +56,8 @@ var config = {
//disableAdaptiveSimulcast: false, //disableAdaptiveSimulcast: false,
enableRecording: false, enableRecording: false,
enableWelcomePage: true, enableWelcomePage: true,
//enableClosePage: false, // enabling the close page will ignore the welcome
// page redirection when call is hangup
disableSimulcast: false, disableSimulcast: false,
logStats: false, // Enable logging of PeerConnection stats via the focus logStats: false, // Enable logging of PeerConnection stats via the focus
// requireDisplayName: true, // Forces the participants that doesn't have display name to enter it when they enter the room. // requireDisplayName: true, // Forces the participants that doesn't have display name to enter it when they enter the room.

12
css/_close.scss Normal file
View File

@ -0,0 +1,12 @@
html, body {
width: 100%;
height:100%;
color: $defaultColor;
background: $defaultBackground;
text-align: center;
}
.closeMessage {
font-size: 36px;
margin-top: 20%;
}

2
css/main.scss
View File

@ -42,5 +42,7 @@
@import 'device_settings_dialog'; @import 'device_settings_dialog';
@import 'jquery.contextMenu'; @import 'jquery.contextMenu';
@import 'keyboard-shortcuts'; @import 'keyboard-shortcuts';
@import 'close';
/* Modules END */ /* Modules END */

11
modules/UI/UI.js
View File

@ -1130,14 +1130,9 @@ UI.requestFeedback = function () {
} }
} else { } else {
// If the feedback functionality isn't enabled we show a thank // If the feedback functionality isn't enabled we show a thank
// you dialog. // you dialog. Signaling it (true), so the caller
messageHandler.openMessageDialog( // of requestFeedback can act on it
null, null, null, resolve(true);
APP.translation.translateString(
"dialog.thankYou", {appName:interfaceConfig.APP_NAME}
)
);
resolve();
} }
}); });
}; };