deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-20 23:26:36 +02:00
Code Issues 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>
<!-- TODO: move closed style to it's own class -->
<div
ref="element"
v-if="
!network.isCollapsed ||
channel.highlight ||
@ -49,7 +50,8 @@ export default {
if (this.channel.type === "lobby") {
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;
}
}

4
client/js/lounge.js
View file

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

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

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