Allow connecting/disconnecting from networks in UI, closes #631
This commit is contained in:
parent
b7072c8955
commit
9c4c1d6d51
@ -265,6 +265,8 @@ kbd {
|
|||||||
.context-menu-user::before { content: "\f007"; /* http://fontawesome.io/icon/user/ */ }
|
.context-menu-user::before { content: "\f007"; /* http://fontawesome.io/icon/user/ */ }
|
||||||
.context-menu-close::before { content: "\f00d"; /* http://fontawesome.io/icon/times/ */ }
|
.context-menu-close::before { content: "\f00d"; /* http://fontawesome.io/icon/times/ */ }
|
||||||
.context-menu-list::before { content: "\f03a"; /* http://fontawesome.io/icon/list/ */ }
|
.context-menu-list::before { content: "\f03a"; /* http://fontawesome.io/icon/list/ */ }
|
||||||
|
.context-menu-disconnect::before { content: "\f0c1"; /* https://fontawesome.com/icons/unlink?style=solid */ }
|
||||||
|
.context-menu-connect::before { content: "\f127"; /* https://fontawesome.com/icons/link?style=solid */ }
|
||||||
.context-menu-action-whois::before { content: "\f05a"; /* http://fontawesome.io/icon/info-circle/ */ }
|
.context-menu-action-whois::before { content: "\f05a"; /* http://fontawesome.io/icon/info-circle/ */ }
|
||||||
.context-menu-action-kick::before { content: "\f05e"; /* http://fontawesome.io/icon/ban/ */ }
|
.context-menu-action-kick::before { content: "\f05e"; /* http://fontawesome.io/icon/ban/ */ }
|
||||||
.context-menu-action-op::before { content: "\f1fa"; /* http://fontawesome.io/icon/at/ */ }
|
.context-menu-action-op::before { content: "\f1fa"; /* http://fontawesome.io/icon/at/ */ }
|
||||||
|
@ -108,6 +108,82 @@ function addQueryItem() {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addCloseItem() {
|
||||||
|
function getCloseDisplay(target) {
|
||||||
|
if (target.hasClass("lobby")) {
|
||||||
|
return "Remove";
|
||||||
|
} else if (target.hasClass("channel")) {
|
||||||
|
return "Leave";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "Close";
|
||||||
|
}
|
||||||
|
|
||||||
|
addContextMenuItem({
|
||||||
|
check: (target) => target.hasClass("chan"),
|
||||||
|
className: "close",
|
||||||
|
displayName: getCloseDisplay,
|
||||||
|
data: (target) => target.attr("data-target"),
|
||||||
|
callback: (itemData) => utils.closeChan($(`.networks .chan[data-target="${itemData}"]`)),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function addConnectItem() {
|
||||||
|
let clickedNetwork;
|
||||||
|
|
||||||
|
function isDisconnected(target) {
|
||||||
|
return target.parent().hasClass("not-connected");
|
||||||
|
}
|
||||||
|
|
||||||
|
function connect() {
|
||||||
|
socket.emit("input", {
|
||||||
|
target: $("#chat").data("id"),
|
||||||
|
text: "/connect",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function check(target) {
|
||||||
|
clickedNetwork = target;
|
||||||
|
return target.hasClass("lobby") && isDisconnected(target);
|
||||||
|
}
|
||||||
|
|
||||||
|
addContextMenuItem({
|
||||||
|
check: check,
|
||||||
|
className: "connect",
|
||||||
|
displayName: "Connect",
|
||||||
|
data: () => clickedNetwork.data("id"),
|
||||||
|
callback: connect,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function addDisconnectItem() {
|
||||||
|
let clickedNetwork;
|
||||||
|
|
||||||
|
function isConnected(target) {
|
||||||
|
return !target.parent().hasClass("not-connected");
|
||||||
|
}
|
||||||
|
|
||||||
|
function disconnect() {
|
||||||
|
socket.emit("input", {
|
||||||
|
target: $("#chat").data("id"),
|
||||||
|
text: "/disconnect",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function check(target) {
|
||||||
|
clickedNetwork = target;
|
||||||
|
return target.hasClass("lobby") && isConnected(target);
|
||||||
|
}
|
||||||
|
|
||||||
|
addContextMenuItem({
|
||||||
|
check: check,
|
||||||
|
className: "disconnect",
|
||||||
|
displayName: "Disconnect",
|
||||||
|
data: () => clickedNetwork.data("id"),
|
||||||
|
callback: disconnect,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function addKickItem() {
|
function addKickItem() {
|
||||||
function kick(itemData) {
|
function kick(itemData) {
|
||||||
socket.emit("input", {
|
socket.emit("input", {
|
||||||
@ -324,4 +400,7 @@ function addDefaultItems() {
|
|||||||
addChannelListItem();
|
addChannelListItem();
|
||||||
addBanListItem();
|
addBanListItem();
|
||||||
addIgnoreListItem();
|
addIgnoreListItem();
|
||||||
|
addConnectItem();
|
||||||
|
addDisconnectItem();
|
||||||
|
addCloseItem();
|
||||||
}
|
}
|
||||||
|
@ -300,49 +300,8 @@ $(function() {
|
|||||||
$("#help").on("click", "#view-changelog, #back-to-help", openWindow);
|
$("#help").on("click", "#view-changelog, #back-to-help", openWindow);
|
||||||
$("#changelog").on("click", "#back-to-help", openWindow);
|
$("#changelog").on("click", "#back-to-help", openWindow);
|
||||||
|
|
||||||
function closeChan(chan) {
|
|
||||||
let cmd = "/close";
|
|
||||||
|
|
||||||
if (chan.hasClass("lobby")) {
|
|
||||||
cmd = "/quit";
|
|
||||||
const server = chan.find(".name").html();
|
|
||||||
|
|
||||||
if (!confirm("Disconnect from " + server + "?")) { // eslint-disable-line no-alert
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
socket.emit("input", {
|
|
||||||
target: chan.data("id"),
|
|
||||||
text: cmd,
|
|
||||||
});
|
|
||||||
chan.css({
|
|
||||||
transition: "none",
|
|
||||||
opacity: 0.4,
|
|
||||||
});
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
sidebar.on("click", ".close", function() {
|
sidebar.on("click", ".close", function() {
|
||||||
closeChan($(this).closest(".chan"));
|
utils.closeChan($(this).closest(".chan"));
|
||||||
});
|
|
||||||
|
|
||||||
const getCloseDisplay = (target) => {
|
|
||||||
if (target.hasClass("lobby")) {
|
|
||||||
return "Disconnect";
|
|
||||||
} else if (target.hasClass("channel")) {
|
|
||||||
return "Leave";
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Close";
|
|
||||||
};
|
|
||||||
|
|
||||||
contextMenuFactory.addContextMenuItem({
|
|
||||||
check: (target) => target.hasClass("chan"),
|
|
||||||
className: "close",
|
|
||||||
displayName: getCloseDisplay,
|
|
||||||
data: (target) => target.attr("data-target"),
|
|
||||||
callback: (itemData) => closeChan($(`.networks .chan[data-target="${itemData}"]`)),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$(document).on("visibilitychange focus click", () => {
|
$(document).on("visibilitychange focus click", () => {
|
||||||
|
@ -18,6 +18,7 @@ module.exports = {
|
|||||||
scrollIntoViewNicely,
|
scrollIntoViewNicely,
|
||||||
hasRoleInChannel,
|
hasRoleInChannel,
|
||||||
move,
|
move,
|
||||||
|
closeChan,
|
||||||
resetHeight,
|
resetHeight,
|
||||||
toggleNotificationMarkers,
|
toggleNotificationMarkers,
|
||||||
togglePasswordField,
|
togglePasswordField,
|
||||||
@ -138,6 +139,30 @@ function move(array, old_index, new_index) {
|
|||||||
return array;
|
return array;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function closeChan(chan) {
|
||||||
|
const socket = require("./socket");
|
||||||
|
let cmd = "/close";
|
||||||
|
|
||||||
|
if (chan.hasClass("lobby")) {
|
||||||
|
cmd = "/quit";
|
||||||
|
const server = chan.find(".name").html();
|
||||||
|
|
||||||
|
if (!confirm("Disconnect from " + server + "?")) { // eslint-disable-line no-alert
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
socket.emit("input", {
|
||||||
|
target: chan.data("id"),
|
||||||
|
text: cmd,
|
||||||
|
});
|
||||||
|
chan.css({
|
||||||
|
transition: "none",
|
||||||
|
opacity: 0.4,
|
||||||
|
});
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
function requestIdleCallback(callback, timeout) {
|
function requestIdleCallback(callback, timeout) {
|
||||||
if (window.requestIdleCallback) {
|
if (window.requestIdleCallback) {
|
||||||
// During an idle period the user agent will run idle callbacks in FIFO order
|
// During an idle period the user agent will run idle callbacks in FIFO order
|
||||||
|
Loading…
Reference in New Issue
Block a user