supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2626 from thelounge/xpaw/context-menu-target

Browse Source 
Fix incorrect target in (dis)connect context menu
This commit is contained in:
Jérémie Astori 2018-07-07 02:05:51 -04:00 committed by GitHub
commit b6b0e70046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
client/js/contextMenuFactory.js
View File

@ -127,57 +127,35 @@ function addCloseItem() {
} }
function addConnectItem() { function addConnectItem() {
let clickedNetwork; function connect(itemData) {
function isDisconnected(target) {
return target.parent().hasClass("not-connected");
}
function connect() {
socket.emit("input", { socket.emit("input", {
target: $("#chat").data("id"), target: Number(itemData),
text: "/connect", text: "/connect",
}); });
} }
function check(target) {
clickedNetwork = target;
return target.hasClass("lobby") && isDisconnected(target);
}
addContextMenuItem({ addContextMenuItem({
check: check, check: (target) => target.hasClass("lobby") && target.parent().hasClass("not-connected"),
className: "connect", className: "connect",
displayName: "Connect", displayName: "Connect",
data: () => clickedNetwork.data("id"), data: (target) => target.data("id"),
callback: connect, callback: connect,
}); });
} }
function addDisconnectItem() { function addDisconnectItem() {
let clickedNetwork; function disconnect(itemData) {
function isConnected(target) {
return !target.parent().hasClass("not-connected");
}
function disconnect() {
socket.emit("input", { socket.emit("input", {
target: $("#chat").data("id"), target: Number(itemData),
text: "/disconnect", text: "/disconnect",
}); });
} }
function check(target) {
clickedNetwork = target;
return target.hasClass("lobby") && isConnected(target);
}
addContextMenuItem({ addContextMenuItem({
check: check, check: (target) => target.hasClass("lobby") && !target.parent().hasClass("not-connected"),
className: "disconnect", className: "disconnect",
displayName: "Disconnect", displayName: "Disconnect",
data: () => clickedNetwork.data("id"), data: (target) => target.data("id"),
callback: disconnect, callback: disconnect,
}); });
} }