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

Fix oversights during rebase.

Browse Source
This commit is contained in:
Richard Lewis 2019-08-03 21:48:06 +03:00 committed by Pavel Djundik
parent b994ecd1f1
commit e0ec340de8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/components/ChannelWrapper.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<!-- TODO: move closed style to it's own class --> <!-- TODO: move closed style to it's own class -->
<div <div
ref="element"
v-if=" v-if="
!network.isCollapsed || !network.isCollapsed ||
channel.highlight || channel.highlight ||
@ -49,7 +50,8 @@ export default {
if (this.channel.type === "lobby") { if (this.channel.type === "lobby") {
cmd = "/quit"; cmd = "/quit";
if (!confirm(`Are you sure you want to remove ${this.channel.name}?`)) { // eslint-disable-line no-alert if (!confirm(`Are you sure you want to remove ${this.channel.name}?`)) {
// eslint-disable-line no-alert
return false; return false;
} }
} }

4
client/js/lounge.js
View File

@ -102,7 +102,7 @@ window.vueMounted = () => {
socket.emit("open", channel ? channel.channel.id : null); socket.emit("open", channel ? channel.channel.id : null);
if (!keepSidebarOpen && $(window).outerWidth() <= utils.mobileViewportPixels) { if ($(window).outerWidth() <= utils.mobileViewportPixels) {
vueApp.setSidebar(false); vueApp.setSidebar(false);
} }
} else { } else {
@ -110,7 +110,7 @@ window.vueMounted = () => {
const component = self.attr("data-component"); const component = self.attr("data-component");
vueApp.$store.commit("activeWindow", component); vueApp.$store.commit("activeWindow", component);
if (!keepSidebarOpen && $(window).outerWidth() <= utils.mobileViewportPixels) { if ($(window).outerWidth() <= utils.mobileViewportPixels) {
vueApp.setSidebar(false); vueApp.setSidebar(false);
} }
} }

1
client/js/socket-events/index.js
View File

@ -1,7 +1,6 @@
"use strict"; "use strict";
require("./auth"); require("./auth");
require("./change_password");
require("./commands"); require("./commands");
require("./init"); require("./init");
require("./join"); require("./join");