Merge pull request #1880 from thelounge/astorije/client-settings-tooltip
Rename "Client Settings" into "Settings" in tooltip + cleanup
This commit is contained in:
commit
18d135ca92
@ -39,7 +39,7 @@
|
||||
<footer id="footer">
|
||||
<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Sign in"><button class="icon sign-in" data-target="#sign-in" aria-label="Sign in"></button></span>
|
||||
<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Connect to network"><button class="icon connect" data-target="#connect" aria-label="Connect to network"></button></span>
|
||||
<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Client settings"><button class="icon settings" data-target="#settings" aria-label="Client settings"></button></span>
|
||||
<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Settings"><button class="icon settings" data-target="#settings" aria-label="Settings"></button></span>
|
||||
<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Help"><button class="icon help" data-target="#help" aria-label="Help"></button></span>
|
||||
<span class="tooltipped tooltipped-n tooltipped-no-touch" aria-label="Sign out"><button class="icon sign-out" id="sign-out" aria-label="Sign out"></button></span>
|
||||
</footer>
|
||||
@ -83,7 +83,7 @@
|
||||
</div>
|
||||
<div id="sign-in" class="window"></div>
|
||||
<div id="connect" class="window"></div>
|
||||
<div id="settings" class="window" data-type="settings"></div>
|
||||
<div id="settings" class="window"></div>
|
||||
<div id="help" class="window"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -433,7 +433,7 @@ $(function() {
|
||||
}
|
||||
|
||||
var chanChat = chan.find(".chat");
|
||||
if (chanChat.length > 0 && chan.data("type") !== "special") {
|
||||
if (chanChat.length > 0 && type !== "special") {
|
||||
chanChat.sticky();
|
||||
}
|
||||
|
||||
@ -442,7 +442,7 @@ $(function() {
|
||||
socket.emit("names", {target: self.data("id")});
|
||||
}
|
||||
|
||||
if (type === "settings") {
|
||||
if (target === "#settings") {
|
||||
$("#session-list").html("<p>Loading…</p>");
|
||||
socket.emit("sessions:get");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user