Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:22:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix "show me" and "visible to" in users window not being remembered

Browse source
This commit is contained in:
David Rowe 2016-06-25 13:48:43 +12:00 committed by Brad Hefta-Gaub
parent 6a0c29f993
commit 8f2e95cde2
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
scripts/system/users.js
View file

@ -359,14 +359,17 @@ var usersWindow = (function () {
usersTimer = null, usersTimer = null,
USERS_UPDATE_TIMEOUT = 5000, // ms = 5s USERS_UPDATE_TIMEOUT = 5000, // ms = 5s
showMe,
myVisibility, myVisibility,
MENU_NAME = "View", MENU_NAME = "View",
MENU_ITEM = "Users Online", MENU_ITEM = "Users Online",
MENU_ITEM_AFTER = "Overlays", MENU_ITEM_AFTER = "Overlays",
SETTING_USERS_SHOW_ME = "UsersWindow.ShowMe",
SETTING_USERS_VISIBLE_TO = "UsersWindow.VisibleTo",
SETTING_USERS_WINDOW_MINIMIZED = "UsersWindow.Minimized", SETTING_USERS_WINDOW_MINIMIZED = "UsersWindow.Minimized",
SETINGS_USERS_WINDOW_OFFSET = "UsersWindow.Offset", SETTING_USERS_WINDOW_OFFSET = "UsersWindow.Offset",
// +ve x, y values are offset from left, top of screen; -ve from right, bottom. // +ve x, y values are offset from left, top of screen; -ve from right, bottom.
isVisible = true, isVisible = true,
@ -550,7 +553,7 @@ var usersWindow = (function () {
function pollUsers() { function pollUsers() {
var url = API_URL; var url = API_URL;
if (displayControl.getValue() === DISPLAY_FRIENDS) { if (showMe === DISPLAY_FRIENDS) {
url += API_FRIENDS_FILTER; url += API_FRIENDS_FILTER;
} }
@ -681,9 +684,11 @@ var usersWindow = (function () {
function onFindableByChanged(event) { function onFindableByChanged(event) {
if (VISIBILITY_VALUES.indexOf(event) !== -1) { if (VISIBILITY_VALUES.indexOf(event) !== -1) {
myVisibility = event;
visibilityControl.setValue(event); visibilityControl.setValue(event);
Settings.setValue(SETTING_USERS_VISIBLE_TO, myVisibility);
} else { } else {
print("Error: Unrecognized onFindableByChanged value: " + myVisibility); print("Error: Unrecognized onFindableByChanged value: " + event);
} }
} }
@ -713,11 +718,15 @@ var usersWindow = (function () {
usersTimer = null; usersTimer = null;
} }
pollUsers(); pollUsers();
showMe = displayControl.getValue();
Settings.setValue(SETTING_USERS_SHOW_ME, showMe);
return; return;
} }
if (visibilityControl.handleClick(clickedOverlay)) { if (visibilityControl.handleClick(clickedOverlay)) {
GlobalServices.findableBy = visibilityControl.getValue(); myVisibility = visibilityControl.getValue();
GlobalServices.findableBy = myVisibility;
Settings.setValue(SETTING_USERS_VISIBLE_TO, myVisibility);
return; return;
} }
@ -869,7 +878,7 @@ var usersWindow = (function () {
// Save offset of bottom of window to nearest edge of the window. // Save offset of bottom of window to nearest edge of the window.
offset.x = (windowPosition.x + WINDOW_WIDTH / 2 < viewport.x / 2) ? windowPosition.x : windowPosition.x - viewport.x; offset.x = (windowPosition.x + WINDOW_WIDTH / 2 < viewport.x / 2) ? windowPosition.x : windowPosition.x - viewport.x;
offset.y = (windowPosition.y < viewport.y / 2) ? windowPosition.y : windowPosition.y - viewport.y; offset.y = (windowPosition.y < viewport.y / 2) ? windowPosition.y : windowPosition.y - viewport.y;
Settings.setValue(SETINGS_USERS_WINDOW_OFFSET, JSON.stringify(offset)); Settings.setValue(SETTING_USERS_WINDOW_OFFSET, JSON.stringify(offset));
isMovingWindow = false; isMovingWindow = false;
} }
} }
@ -925,9 +934,9 @@ var usersWindow = (function () {
viewport = Controller.getViewportDimensions(); viewport = Controller.getViewportDimensions();
offsetSetting = Settings.getValue(SETINGS_USERS_WINDOW_OFFSET); offsetSetting = Settings.getValue(SETTING_USERS_WINDOW_OFFSET);
if (offsetSetting !== "") { if (offsetSetting !== "") {
offset = JSON.parse(Settings.getValue(SETINGS_USERS_WINDOW_OFFSET)); offset = JSON.parse(Settings.getValue(SETTING_USERS_WINDOW_OFFSET));
} }
if (offset.hasOwnProperty("x") && offset.hasOwnProperty("y")) { if (offset.hasOwnProperty("x") && offset.hasOwnProperty("y")) {
windowPosition.x = offset.x < 0 ? viewport.x + offset.x : offset.x; windowPosition.x = offset.x < 0 ? viewport.x + offset.x : offset.x;
@ -1048,9 +1057,14 @@ var usersWindow = (function () {
alpha: FRIENDS_BUTTON_ALPHA alpha: FRIENDS_BUTTON_ALPHA
}); });
showMe = Settings.getValue(SETTING_USERS_SHOW_ME, "");
if (DISPLAY_VALUES.indexOf(showMe) === -1) {
showMe = DISPLAY_EVERYONE;
}
displayControl = new PopUpMenu({ displayControl = new PopUpMenu({
prompt: DISPLAY_PROMPT, prompt: DISPLAY_PROMPT,
value: DISPLAY_VALUES[0], value: showMe,
values: DISPLAY_VALUES, values: DISPLAY_VALUES,
displayValues: DISPLAY_DISPLAY_VALUES, displayValues: DISPLAY_DISPLAY_VALUES,
x: 0, x: 0,
@ -1075,10 +1089,9 @@ var usersWindow = (function () {
visible: isVisible && !isMinimized visible: isVisible && !isMinimized
}); });
myVisibility = GlobalServices.findableBy; myVisibility = Settings.getValue(SETTING_USERS_VISIBLE_TO, "");
if (VISIBILITY_VALUES.indexOf(myVisibility) === -1) { if (VISIBILITY_VALUES.indexOf(myVisibility) === -1) {
print("Error: Unrecognized findableBy value: " + myVisibility); myVisibility = VISIBILITY_FRIENDS;
myVisibility = VISIBILITY_ALL;
} }
visibilityControl = new PopUpMenu({ visibilityControl = new PopUpMenu({