Browse Source

Moves Settings module out from the UI.

master
paweldomas 10 years ago
parent
commit
b87cd9f842

+ 1
- 1
modules/UI/UI.js View File

12
 var Avatar = require("./avatar/Avatar");
12
 var Avatar = require("./avatar/Avatar");
13
 var EventEmitter = require("events");
13
 var EventEmitter = require("events");
14
 var SettingsMenu = require("./side_pannels/settings/SettingsMenu");
14
 var SettingsMenu = require("./side_pannels/settings/SettingsMenu");
15
-var Settings = require("./side_pannels/settings/Settings");
15
+var Settings = require("./../settings/Settings");
16
 var PanelToggler = require("./side_pannels/SidePanelToggler");
16
 var PanelToggler = require("./side_pannels/SidePanelToggler");
17
 var RoomNameGenerator = require("./welcome_page/RoomnameGenerator");
17
 var RoomNameGenerator = require("./welcome_page/RoomnameGenerator");
18
 UI.messageHandler = require("./util/MessageHandler");
18
 UI.messageHandler = require("./util/MessageHandler");

+ 1
- 1
modules/UI/avatar/Avatar.js View File

1
-var Settings = require("../side_pannels/settings/Settings");
1
+var Settings = require("../../settings/Settings");
2
 var MediaStreamType = require("../../../service/RTC/MediaStreamTypes");
2
 var MediaStreamType = require("../../../service/RTC/MediaStreamTypes");
3
 
3
 
4
 var users = {};
4
 var users = {};

+ 1
- 1
modules/UI/side_pannels/SidePanelToggler.js View File

1
 var Chat = require("./chat/Chat");
1
 var Chat = require("./chat/Chat");
2
 var ContactList = require("./contactlist/ContactList");
2
 var ContactList = require("./contactlist/ContactList");
3
-var Settings = require("./settings/Settings");
3
+var Settings = require("./../../settings/Settings");
4
 var SettingsMenu = require("./settings/SettingsMenu");
4
 var SettingsMenu = require("./settings/SettingsMenu");
5
 var VideoLayout = require("../videolayout/VideoLayout");
5
 var VideoLayout = require("../videolayout/VideoLayout");
6
 var ToolbarToggler = require("../toolbars/ToolbarToggler");
6
 var ToolbarToggler = require("../toolbars/ToolbarToggler");

+ 1
- 1
modules/UI/side_pannels/settings/SettingsMenu.js View File

1
 var Avatar = require("../../avatar/Avatar");
1
 var Avatar = require("../../avatar/Avatar");
2
-var Settings = require("./Settings");
2
+var Settings = require("./../../../settings/Settings");
3
 var UIUtil = require("../../util/UIUtil");
3
 var UIUtil = require("../../util/UIUtil");
4
 var languages = require("../../../../service/translation/languages");
4
 var languages = require("../../../../service/translation/languages");
5
 
5
 

modules/UI/side_pannels/settings/Settings.js → modules/settings/Settings.js View File

15
 
15
 
16
 function generateUniqueId() {
16
 function generateUniqueId() {
17
     function _p8() {
17
     function _p8() {
18
-        return (Math.random().toString(16)+"000000000").substr(2,8);
18
+        return (Math.random().toString(16) + "000000000").substr(2, 8);
19
     }
19
     }
20
     return _p8() + _p8() + _p8() + _p8();
20
     return _p8() + _p8() + _p8() + _p8();
21
 }
21
 }
22
 
22
 
23
-if(supportsLocalStorage()) {
24
-    if(!window.localStorage.jitsiMeetId) {
23
+if (supportsLocalStorage()) {
24
+    if (!window.localStorage.jitsiMeetId) {
25
         window.localStorage.jitsiMeetId = generateUniqueId();
25
         window.localStorage.jitsiMeetId = generateUniqueId();
26
         console.log("generated id", window.localStorage.jitsiMeetId);
26
         console.log("generated id", window.localStorage.jitsiMeetId);
27
     }
27
     }
40
         window.localStorage.displayname = displayName;
40
         window.localStorage.displayname = displayName;
41
         return displayName;
41
         return displayName;
42
     },
42
     },
43
-    setEmail: function(newEmail)
43
+    setEmail: function (newEmail)
44
     {
44
     {
45
         email = newEmail;
45
         email = newEmail;
46
         window.localStorage.email = newEmail;
46
         window.localStorage.email = newEmail;

Loading…
Cancel
Save