refactor(close_pages): Refactor the close pages.

utike · Nov 14, 2016 · 4bcd75f · 4bcd75f
1 parent da6af88
commit 4bcd75f
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 67 deletions.
diff --git a/close.html b/close.html
@@ -3,19 +3,12 @@
     <link rel="stylesheet" href="css/all.css"/>
     <!--#include virtual="title.html" -->
     <script><!--#include virtual="/interface_config.js" --></script>
-    <script src="randomizer.js"></script>
-    <script src="utils.js"></script>
-    <script>
-        function onDocumentReady() {
-            insertTextMsgIntoDocument('hintMessage',
-                randomizer.getItem());
-        }
-    </script>
+    <script src="close.js"></script>
 </head>
-<body onload="onDocumentReady();">
+<body>
 <div class="redirectPageMessage">
     <div class="thanks-msg">
-        <p id="thanksMessage">Thank you for your feedback!</p>
+        <p>Thank you for your feedback!</p>
     </div>
     <div class="hint-msg">
         <p>
@@ -26,4 +19,4 @@
     </div>
 </div>
 </body>
-</html>
+</html>
diff --git a/close.js b/close.js
@@ -0,0 +1,48 @@
+/* global interfaceConfig */
+//list of tips
+var hints = [
+    "You can pin participants by clicking on their thumbnails.",// jshint ignore:line
+    "You can tell others you have something to say by using the \"Raise Hand\" feature",// jshint ignore:line
+    "You can learn about key shortcuts by pressing Shift+?",// jshint ignore:line
+    "You can learn more about the state of everyone's connection by hovering on the bars in their thumbnail",// jshint ignore:line
+    "You can hide all thumbnails by using the button in the bottom right corner"// jshint ignore:line
+];
+
+/**
+ * Get a random hint meessage from hint array.
+ *
+ * @return {string} the hint message.
+ */
+function getHint(){
+    var l = hints.length - 1;
+    var n = Math.round(Math.random() * l);
+
+    return hints[n];
+}
+
+/**
+ * Inserts text message
+ * into DOM element
+ *
+ * @param id {string} element identificator
+ * @param msg {string} text message
+ */
+// eslint-disable-next-line no-unused-vars
+function insertTextMsg(id, msg){
+    var el = document.getElementById(id);
+
+    if (el)
+        el.innerText = msg;
+}
+
+/**
+ * Sets the hint and thanks messages. Will be executed on load event.
+ */
+function onLoad() {
+    //Works only for close2.html because close.html doesn't have this element.
+    insertTextMsg('thanksMessage',
+        'Thank you for using ' + interfaceConfig.APP_NAME);
+    insertTextMsg('hintMessage', getHint());
+}
+
+window.onload = onLoad;
diff --git a/close2.html b/close2.html
@@ -3,18 +3,9 @@
     <link rel="stylesheet" href="css/all.css"/>
     <!--#include virtual="title.html" -->
     <script><!--#include virtual="/interface_config.js" --></script>
-    <script src="randomizer.js"></script>
-    <script src="utils.js"></script>
-    <script>
-        function onDocumentReady() {
-            insertTextMsgIntoDocument('thanksMessage',
-                'Thank you for using ' + interfaceConfig.APP_NAME);
-            insertTextMsgIntoDocument('hintMessage',
-                randomizer.getItem());
-        }
-    </script>
+    <script src="close.js"></script>
 </head>
-<body onload="onDocumentReady();">
+<body>
     <div class="redirectPageMessage">
         <div class="thanks-msg">
             <p id="thanksMessage"></p>

diff --git a/randomizer.js b/randomizer.js
diff --git a/utils.js b/utils.js
@@ -66,18 +66,3 @@ function getConfigParamsFromUrl(source, dontParse) {
     });
     return result;
 }
-
-/**
- * Inserts text message
- * into DOM element
- *
- * @param id {string} element identificator
- * @param msg {string} text message
- */
-// eslint-disable-next-line no-unused-vars
-function insertTextMsgIntoDocument(id, msg){
-    var el = document.getElementById(id);
-
-    if (el)
-        el.innerText = msg;
-}