Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:28:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

display users even if they dont have a domain name

Browse source
This commit is contained in:
Faye Li 2017-02-13 11:01:37 -08:00
parent 8cc8f2c7fd
commit 27057190ce
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
scripts/system/html/users.html
View file

@ -338,25 +338,28 @@
function displayUsers(data, element) { function displayUsers(data, element) {
element.empty(); element.empty();
for (var i = 0; i < data.users.length; i++) { for (var i = 0; i < data.users.length; i++) {
// Don't display users who aren't in a domain // Display users who aren't in a domain differently
if (typeof data.users[i].location.root.name === "undefined") { if (typeof data.users[i].location.root.name === "undefined" || data.users[i].location.root.name === null) {
console.log(data.users[i].username + "is online but not in a domain"); console.log(data.users[i].username + "is online but not in a domain");
$("#dev-div").append("<p>" + data.users[i].username + "is online but not in a domain</p>"); $("#dev-div").append("<p>" + data.users[i].username + "is online but not in a domain</p>");
$("<li></li>", {
"data-toggle": "modal",
"data-target": "#myModal",
"data-username": data.users[i].username,
"data-placename": "",
text: data.users[i].username
}).appendTo(element);
} else { } else {
$("#dev-div").append("<li>" + data.users[i].username + " @ " + data.users[i].location.root.name + "</li>"); $("#dev-div").append("<li>" + data.users[i].username + " @ " + data.users[i].location.root.name + "</li>");
if (data.users[i].username === myUsername) { console.log(data.users[i].username + " @ " + data.users[i].location.root.name);
$("#user-info-div h4").text(data.users[i].username + " @ " + data.users[i].location.root.name); // Create a list item and put user info in data-* attributes, also make it trigger the jump to confirmation modal
} else { $("<li></li>", {
console.log(data.users[i].username + " @ " + data.users[i].location.root.name); "data-toggle": "modal",
// Create a list item and put user info in data-* attributes, also make it trigger the jump to confirmation modal "data-target": "#myModal",
$("<li></li>", { "data-username": data.users[i].username,
"data-toggle": "modal", "data-placename": data.users[i].location.root.name,
"data-target": "#myModal", text: data.users[i].username + " @ " + data.users[i].location.root.name
"data-username": data.users[i].username, }).appendTo(element);
"data-placename": data.users[i].location.root.name,
text: data.users[i].username + " @ " + data.users[i].location.root.name
}).appendTo(element);
}
} }
} }
} }
@ -454,7 +457,11 @@
var placename = li.data("placename"); var placename = li.data("placename");
// Write info to the modal // Write info to the modal
var modal = $(this); var modal = $(this);
modal.find(".modal-title").text("Jump to " + username + " @ " + placename); if (placename === "") {
modal.find(".modal-title").text("Jump to " + username);
} else {
modal.find(".modal-title").text("Jump to " + username + " @ " + placename);
}
$("#jump-to-confirm-button").data("username", username); $("#jump-to-confirm-button").data("username", username);
}) })