Procházet zdrojové kódy

Moves the roomname generator to util, reuses a function.

master
Boris Grozev před 10 roky
rodič
revize
4009fed35d

+ 2
- 2
modules/UI/UI.js Zobrazit soubor

16
 var SettingsMenu = require("./side_pannels/settings/SettingsMenu");
16
 var SettingsMenu = require("./side_pannels/settings/SettingsMenu");
17
 var Settings = require("./../settings/Settings");
17
 var Settings = require("./../settings/Settings");
18
 var PanelToggler = require("./side_pannels/SidePanelToggler");
18
 var PanelToggler = require("./side_pannels/SidePanelToggler");
19
-var RoomNameGenerator = require("./welcome_page/RoomnameGenerator");
19
+var RoomnameGenerator = require("../util/RoomnameGenerator");
20
 UI.messageHandler = require("./util/MessageHandler");
20
 UI.messageHandler = require("./util/MessageHandler");
21
 var messageHandler = UI.messageHandler;
21
 var messageHandler = UI.messageHandler;
22
 var Authentication  = require("./authentication/Authentication");
22
 var Authentication  = require("./authentication/Authentication");
718
         if (path.length > 1) {
718
         if (path.length > 1) {
719
             roomNode = path.substr(1).toLowerCase();
719
             roomNode = path.substr(1).toLowerCase();
720
         } else {
720
         } else {
721
-            var word = RoomNameGenerator.generateRoomWithoutSeparator();
721
+            var word = RoomnameGenerator.generateRoomWithoutSeparator();
722
             roomNode = word.toLowerCase();
722
             roomNode = word.toLowerCase();
723
             window.history.pushState('VideoChat',
723
             window.history.pushState('VideoChat',
724
                 'Room: ' + word, window.location.pathname + word);
724
                 'Room: ' + word, window.location.pathname + word);

+ 2
- 2
modules/UI/welcome_page/WelcomePage.js Zobrazit soubor

1
 /* global $, interfaceConfig */
1
 /* global $, interfaceConfig */
2
 var animateTimeout, updateTimeout;
2
 var animateTimeout, updateTimeout;
3
 
3
 
4
-var RoomNameGenerator = require("./RoomnameGenerator");
4
+var RoomnameGenerator = require("../../util/RoomnameGenerator");
5
 
5
 
6
 function enter_room() {
6
 function enter_room() {
7
     var val = $("#enter_room_field").val();
7
     var val = $("#enter_room_field").val();
22
 }
22
 }
23
 
23
 
24
 function update_roomname() {
24
 function update_roomname() {
25
-    var word = RoomNameGenerator.generateRoomWithoutSeparator();
25
+    var word = RoomnameGenerator.generateRoomWithoutSeparator();
26
     $("#enter_room_field").attr("room_name", word);
26
     $("#enter_room_field").attr("room_name", word);
27
     $("#enter_room_field").attr("placeholder", "");
27
     $("#enter_room_field").attr("placeholder", "");
28
     clearTimeout(animateTimeout);
28
     clearTimeout(animateTimeout);

modules/UI/welcome_page/RoomnameGenerator.js → modules/util/RoomnameGenerator.js Zobrazit soubor

1
+var RandomUtil = require('./RandomUtil');
1
 //var nouns = [
2
 //var nouns = [
2
 //];
3
 //];
3
 var pluralNouns = [
4
 var pluralNouns = [
160
     //"_ADJECTIVE__PLURALNOUN_AtThe_PLACE_",
161
     //"_ADJECTIVE__PLURALNOUN_AtThe_PLACE_",
161
 ];
162
 ];
162
 
163
 
163
-
164
-/*
165
- * Returns a random element from the array 'arr'
166
- */
167
-function randomElement(arr) {
168
-    return arr[Math.floor(Math.random() * arr.length)];
169
-}
170
-
171
 /*
164
 /*
172
  * Returns true if the string 's' contains one of the
165
  * Returns true if the string 's' contains one of the
173
  * template strings.
166
  * template strings.
183
 /**
176
 /**
184
  * Generates new room name.
177
  * Generates new room name.
185
  */
178
  */
186
-var RoomNameGenerator = {
179
+var RoomnameGenerator = {
187
     generateRoomWithoutSeparator: function() {
180
     generateRoomWithoutSeparator: function() {
188
         // Note that if more than one pattern is available, the choice of
181
         // Note that if more than one pattern is available, the choice of
189
         // 'name' won't have a uniform distribution amongst all patterns (names
182
         // 'name' won't have a uniform distribution amongst all patterns (names
190
         // from patterns with fewer options will have higher probability of
183
         // from patterns with fewer options will have higher probability of
191
         // being chosen that names from patterns with more options).
184
         // being chosen that names from patterns with more options).
192
-        var name = randomElement(PATTERNS);
185
+        var name = RandomUtil.randomElement(PATTERNS);
193
         var word;
186
         var word;
194
         while (hasTemplate(name)) {
187
         while (hasTemplate(name)) {
195
             for (var template in CATEGORIES) {
188
             for (var template in CATEGORIES) {
196
-                word = randomElement(CATEGORIES[template]);
189
+                word = RandomUtil.randomElement(CATEGORIES[template]);
197
                 name = name.replace(template, word);
190
                 name = name.replace(template, word);
198
             }
191
             }
199
         }
192
         }
202
     }
195
     }
203
 };
196
 };
204
 
197
 
205
-module.exports = RoomNameGenerator;
198
+module.exports = RoomnameGenerator;

Načítá se…
Zrušit
Uložit