deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-07 16:22:18 +02:00
Code Issues Projects Releases Wiki Activity

Do not display incorrect nick when switching to a non connected network

Browse source
This commit is contained in:
Pavel Djundik 2016-04-10 12:08:31 +03:00
parent 49a62c4015
commit 8f217ad3fb
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/css/style.css
View file

@ -1157,6 +1157,7 @@ button,
font: inherit; font: inherit;
font-size: 11px; font-size: 11px;
margin: 5px; margin: 5px;
margin-right: 10px;
line-height: 26px; line-height: 26px;
height: 24px; height: 24px;
padding: 0 9px; padding: 0 9px;
@ -1167,6 +1168,14 @@ button,
user-select: none; user-select: none;
} }
#form #nick:empty {
visibility: hidden;
}
#form #nick:after {
content: ":";
}
#form #input { #form #input {
border: 1px solid #ddd; border: 1px solid #ddd;
font: inherit; font: inherit;

16
client/js/lounge.js
View file

@ -667,12 +667,7 @@ $(function() {
document.title = title; document.title = title;
if (self.hasClass("chan")) { if (self.hasClass("chan")) {
var nick = self setNick(self.closest(".network").data("nick"));
.closest(".network")
.data("nick");
if (nick) {
setNick(nick);
}
} }
if (chan.data("needsNamesRefresh") === true) { if (chan.data("needsNamesRefresh") === true) {
@ -1069,12 +1064,9 @@ $(function() {
function setNick(nick) { function setNick(nick) {
var width = $("#nick") var width = $("#nick")
.html(nick + ":") .html(nick)
.width(); .outerWidth(true);
if (width) { input.css("padding-left", width);
width += 31;
input.css("padding-left", width);
}
} }
function move(array, old_index, new_index) { function move(array, old_index, new_index) {