Adds close page

9 gadus atpakaļ · 06247266ad
--- a/close.html
+++ b/close.html
@@ -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>
			
--- a/conference.js
+++ b/conference.js
@@ -202,8 +202,28 @@ function muteLocalVideo (muted) {
 
				
				 
			
 
				
				 /**
			
 
				
				  * 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) {
			
 
				
				         return;
			
 
				
				     }
			
--- a/config.js
+++ b/config.js
@@ -56,6 +56,8 @@ var config = {
 
				
				     //disableAdaptiveSimulcast: false,
			
 
				
				     enableRecording: false,
			
 
				
				     enableWelcomePage: true,
			
 
				
				+    //enableClosePage: false, // enabling the close page will ignore the welcome
			
 
				
				+                              // page redirection when call is hangup
			
 
				
				     disableSimulcast: false,
			
 
				
				     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.
			
--- a/css/_close.scss
+++ b/css/_close.scss
@@ -0,0 +1,12 @@
 
				
				+html, body {
			
 
				
				+    width: 100%;
			
 
				
				+    height:100%;
			
 
				
				+    color: $defaultColor;
			
 
				
				+    background: $defaultBackground;
			
 
				
				+    text-align: center;
			
 
				
				+}
			
 
				
				+
			
 
				
				+.closeMessage {
			
 
				
				+    font-size: 36px;
			
 
				
				+    margin-top: 20%;
			
 
				
				+}
			
--- a/css/main.scss
+++ b/css/main.scss
@@ -42,5 +42,7 @@
 
				
				 @import 'device_settings_dialog';
			
 
				
				 @import 'jquery.contextMenu';
			
 
				
				 @import 'keyboard-shortcuts';
			
 
				
				+@import 'close';
			
 
				
				+
			
 
				
				 
			
 
				
				 /* Modules END */
			
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -1130,14 +1130,9 @@ UI.requestFeedback = function () {
 
				
				                 }
			
 
				
				             } else {
			
 
				
				                 // If the feedback functionality isn't enabled we show a thank
			
 
				
				-                // you dialog.
			
 
				
				-                messageHandler.openMessageDialog(
			
 
				
				-                    null, null, null,
			
 
				
				-                    APP.translation.translateString(
			
 
				
				-                        "dialog.thankYou", {appName:interfaceConfig.APP_NAME}
			
 
				
				-                    )
			
 
				
				-                );
			
 
				
				-                resolve();
			
 
				
				+                // you dialog. Signaling it (true), so the caller
			
 
				
				+                // of requestFeedback can act on it
			
 
				
				+                resolve(true);
			
 
				
				             }
			
 
				
				         });
			
 
				
				 };