Fix oversights during rebase.
This commit is contained in:
parent
b994ecd1f1
commit
e0ec340de8
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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,7 +1,6 @@
|
||||
"use strict";
|
||||
|
||||
require("./auth");
|
||||
require("./change_password");
|
||||
require("./commands");
|
||||
require("./init");
|
||||
require("./join");
|
||||
|
Loading…
Reference in New Issue
Block a user