Browse Source

fixes and changes

master
Konstantyn Pahsura 8 years ago
parent
commit
da6af88910
4 changed files with 39 additions and 39 deletions
  1. 5
    10
      close.html
  2. 6
    11
      close2.html
  3. 13
    18
      randomizer.js
  4. 15
    0
      utils.js

+ 5
- 10
close.html View File

3
     <link rel="stylesheet" href="css/all.css"/>
3
     <link rel="stylesheet" href="css/all.css"/>
4
     <!--#include virtual="title.html" -->
4
     <!--#include virtual="title.html" -->
5
     <script><!--#include virtual="/interface_config.js" --></script>
5
     <script><!--#include virtual="/interface_config.js" --></script>
6
-    <script src="static/randomizer.js"></script>
6
+    <script src="randomizer.js"></script>
7
+    <script src="utils.js"></script>
7
     <script>
8
     <script>
8
-        var randomizer = new Randomizer();
9
-
10
-        function translateStr(id, msg) {
11
-            var div = document.getElementById(id);
12
-            div.innerHTML = msg;
13
-        }
14
-        function translate() {
15
-            translateStr('hintMessage',
9
+        function onDocumentReady() {
10
+            insertTextMsgIntoDocument('hintMessage',
16
                 randomizer.getItem());
11
                 randomizer.getItem());
17
         }
12
         }
18
     </script>
13
     </script>
19
 </head>
14
 </head>
20
-<body onload="translate();">
15
+<body onload="onDocumentReady();">
21
 <div class="redirectPageMessage">
16
 <div class="redirectPageMessage">
22
     <div class="thanks-msg">
17
     <div class="thanks-msg">
23
         <p id="thanksMessage">Thank you for your feedback!</p>
18
         <p id="thanksMessage">Thank you for your feedback!</p>

+ 6
- 11
close2.html View File

3
     <link rel="stylesheet" href="css/all.css"/>
3
     <link rel="stylesheet" href="css/all.css"/>
4
     <!--#include virtual="title.html" -->
4
     <!--#include virtual="title.html" -->
5
     <script><!--#include virtual="/interface_config.js" --></script>
5
     <script><!--#include virtual="/interface_config.js" --></script>
6
-    <script src="static/randomizer.js"></script>
6
+    <script src="randomizer.js"></script>
7
+    <script src="utils.js"></script>
7
     <script>
8
     <script>
8
-        var randomizer = new Randomizer();
9
-
10
-        function translateStr(id, msg) {
11
-            var div = document.getElementById(id);
12
-            div.innerHTML = msg;
13
-        }
14
-        function translate() {
15
-            translateStr('thanksMessage',
9
+        function onDocumentReady() {
10
+            insertTextMsgIntoDocument('thanksMessage',
16
                 'Thank you for using ' + interfaceConfig.APP_NAME);
11
                 'Thank you for using ' + interfaceConfig.APP_NAME);
17
-            translateStr('hintMessage',
12
+            insertTextMsgIntoDocument('hintMessage',
18
                 randomizer.getItem());
13
                 randomizer.getItem());
19
         }
14
         }
20
     </script>
15
     </script>
21
 </head>
16
 </head>
22
-<body onload="translate();">
17
+<body onload="onDocumentReady();">
23
     <div class="redirectPageMessage">
18
     <div class="redirectPageMessage">
24
         <div class="thanks-msg">
19
         <div class="thanks-msg">
25
             <p id="thanksMessage"></p>
20
             <p id="thanksMessage"></p>

static/randomizer.js → randomizer.js View File

10
     ];
10
     ];
11
 
11
 
12
     /**
12
     /**
13
-     * Creates a new Randomiser.
14
-     *
15
-     * @class
13
+     * Creates a randomiser.
14
+     * Put in in Global scope
16
      */
15
      */
17
-    function Randomizer(){
18
-        this.items = items;
19
-    }
16
+    window.randomizer = {
17
+        /**
18
+         * Get a random integer between 0 and items length.
19
+         *
20
+         * @return {string} a random integer
21
+         */
22
+        getItem: function (){
23
+            var l = items.length - 1;
24
+            var n = Math.round(Math.random() * l);
20
 
25
 
21
-    /**
22
-     * Get a random integer between 0 and items length.
23
-     *
24
-     * @return {string} a random integer
25
-     */
26
-    Randomizer.prototype.getItem = function (){
27
-        var l = this.items.length - 1;
28
-        var n = Math.round(Math.random() * l);
29
-
30
-        return this.items[n];
26
+            return items[n];
27
+        }
31
     };
28
     };
32
-
33
-    window.Randomizer = Randomizer;
34
 })();
29
 })();
35
 
30
 

+ 15
- 0
utils.js View File

66
     });
66
     });
67
     return result;
67
     return result;
68
 }
68
 }
69
+
70
+/**
71
+ * Inserts text message
72
+ * into DOM element
73
+ *
74
+ * @param id {string} element identificator
75
+ * @param msg {string} text message
76
+ */
77
+// eslint-disable-next-line no-unused-vars
78
+function insertTextMsgIntoDocument(id, msg){
79
+    var el = document.getElementById(id);
80
+
81
+    if (el)
82
+        el.innerText = msg;
83
+}

Loading…
Cancel
Save