supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #854 from thelounge/fix-jquery3

Browse Source 
Fix stuff that breaks in jQuery 3
This commit is contained in:
Jérémie Astori 2017-01-02 17:59:50 -05:00 committed by GitHub
commit 259a7d8973
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/js/libs/jquery/inputhistory.js vendored
View File

@ -20,7 +20,7 @@ import jQuery from "jquery";
); );
var self = this; var self = this;
if (self.size() > 1) { if (self.length > 1) {
return self.each(function() { return self.each(function() {
$(this).history(options); $(this).history(options);
}); });

10
client/js/lounge.js
View File

@ -300,10 +300,6 @@ $(function() {
text.html(templates.actions[type](data.msg)); text.html(templates.actions[type](data.msg));
} }
if (text.find("i").size() === 1) {
text = text.find("i");
}
if ((type === "message" || type === "action") && chan.hasClass("channel")) { if ((type === "message" || type === "action") && chan.hasClass("channel")) {
var nicks = chan.find(".users").data("nicks"); var nicks = chan.find(".users").data("nicks");
if (nicks) { if (nicks) {
@ -1095,13 +1091,13 @@ $(function() {
contextMenu.on("click", ".context-menu-item", function() { contextMenu.on("click", ".context-menu-item", function() {
switch ($(this).data("action")) { switch ($(this).data("action")) {
case "close": case "close":
$(".networks .chan[data-target=" + $(this).data("data") + "] .close").click(); $(".networks .chan[data-target='" + $(this).data("data") + "'] .close").click();
break; break;
case "chan": case "chan":
$(".networks .chan[data-target=" + $(this).data("data") + "]").click(); $(".networks .chan[data-target='" + $(this).data("data") + "']").click();
break; break;
case "user": case "user":
$(".channel.active .users .user[data-name=" + $(this).data("data") + "]").click(); $(".channel.active .users .user[data-name='" + $(this).data("data") + "']").click();
break; break;
} }
}); });