Moves Settings module out from the UI.

pull/237/head
paweldomas 10 years ago
parent fed34e7671
commit b87cd9f842
  1. 2
      modules/UI/UI.js
  2. 2
      modules/UI/avatar/Avatar.js
  3. 2
      modules/UI/side_pannels/SidePanelToggler.js
  4. 2
      modules/UI/side_pannels/settings/SettingsMenu.js
  5. 8
      modules/settings/Settings.js

@ -12,7 +12,7 @@ var ContactList = require("./side_pannels/contactlist/ContactList");
var Avatar = require("./avatar/Avatar");
var EventEmitter = require("events");
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 RoomNameGenerator = require("./welcome_page/RoomnameGenerator");
UI.messageHandler = require("./util/MessageHandler");

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

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

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

@ -15,13 +15,13 @@ function supportsLocalStorage() {
function generateUniqueId() {
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();
}
if(supportsLocalStorage()) {
if(!window.localStorage.jitsiMeetId) {
if (supportsLocalStorage()) {
if (!window.localStorage.jitsiMeetId) {
window.localStorage.jitsiMeetId = generateUniqueId();
console.log("generated id", window.localStorage.jitsiMeetId);
}
@ -40,7 +40,7 @@ var Settings =
window.localStorage.displayname = displayName;
return displayName;
},
setEmail: function(newEmail)
setEmail: function (newEmail)
{
email = newEmail;
window.localStorage.email = newEmail;
Loading…
Cancel
Save