deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-23 16:42:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1833 from Cldfire/master

Browse source 
Remove lobby close button
This commit is contained in:
Al McKinlay 2017-12-22 10:18:29 +00:00 committed by GitHub
parent 8ac0586464 daa45c13fd
commit 8004e051aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
client/js/lounge.js
View file

@ -452,9 +452,9 @@ $(function() {
}
});
sidebar.on("click", ".close", function() {
function closeChan(chan) {
var cmd = "/close";
var chan = $(this).closest(".chan");
if (chan.hasClass("lobby")) {
cmd = "/quit";
var server = chan.find(".name").html();
@ -471,11 +471,15 @@ $(function() {
opacity: 0.4,
});
return false;
}
sidebar.on("click", ".close", function() {
closeChan($(this).closest(".chan"));
});
const contextMenuActions = {
close: function(itemData) {
$(`.networks .chan[data-target="${itemData}"] .close`).click();
closeChan($(`.networks .chan[data-target="${itemData}"]`));
},
focusChan: function(itemData) {
$(`.networks .chan[data-target="${itemData}"]`).click();

2
client/views/chan.tpl
View file

@ -1,7 +1,7 @@
{{#each channels}}
<div data-id="{{id}}" data-target="#chan-{{id}}" data-title="{{name}}" class="chan {{type}} chan-{{slugify name}}">
<span class="badge{{#if highlight}} highlight{{/if}}">{{#if unread}}{{roundBadgeNumber unread}}{{/if}}</span>
<button class="close" aria-label="Close"></button>
{{#equal type "lobby"}}{{else}}<button class="close" aria-label="Close"></button>{{/equal}}
<span class="name" title="{{name}}">{{name}}</span>
</div>
{{/each}}