haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves Settings module out from the UI.

This commit is contained in:
paweldomas 2015-02-13 10:38:37 +01:00
parent fed34e7671
commit b87cd9f842
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/UI/UI.js
View File

@ -12,7 +12,7 @@ var ContactList = require("./side_pannels/contactlist/ContactList");
var Avatar = require("./avatar/Avatar"); var Avatar = require("./avatar/Avatar");
var EventEmitter = require("events"); var EventEmitter = require("events");
var SettingsMenu = require("./side_pannels/settings/SettingsMenu"); var SettingsMenu = require("./side_pannels/settings/SettingsMenu");
var Settings = require("./side_pannels/settings/Settings"); var Settings = require("./../settings/Settings");
var PanelToggler = require("./side_pannels/SidePanelToggler"); var PanelToggler = require("./side_pannels/SidePanelToggler");
var RoomNameGenerator = require("./welcome_page/RoomnameGenerator"); var RoomNameGenerator = require("./welcome_page/RoomnameGenerator");
UI.messageHandler = require("./util/MessageHandler"); UI.messageHandler = require("./util/MessageHandler");

2
modules/UI/avatar/Avatar.js
View File

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

2
modules/UI/side_pannels/SidePanelToggler.js
View File

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

2
modules/UI/side_pannels/settings/SettingsMenu.js
View File

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

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

@ -15,13 +15,13 @@ function supportsLocalStorage() {
function generateUniqueId() { function generateUniqueId() {
function _p8() { function _p8() {
return (Math.random().toString(16)+"000000000").substr(2,8); return (Math.random().toString(16) + "000000000").substr(2, 8);
} }
return _p8() + _p8() + _p8() + _p8(); return _p8() + _p8() + _p8() + _p8();
} }
if(supportsLocalStorage()) { if (supportsLocalStorage()) {
if(!window.localStorage.jitsiMeetId) { if (!window.localStorage.jitsiMeetId) {
window.localStorage.jitsiMeetId = generateUniqueId(); window.localStorage.jitsiMeetId = generateUniqueId();
console.log("generated id", window.localStorage.jitsiMeetId); console.log("generated id", window.localStorage.jitsiMeetId);
} }
@ -40,7 +40,7 @@ var Settings =
window.localStorage.displayname = displayName; window.localStorage.displayname = displayName;
return displayName; return displayName;
}, },
setEmail: function(newEmail) setEmail: function (newEmail)
{ {
email = newEmail; email = newEmail;
window.localStorage.email = newEmail; window.localStorage.email = newEmail;