Skip to content

Commit

Permalink
Merge pull request #1500 from thelounge/xpaw/even-more-modules
Browse files Browse the repository at this point in the history 
Move even more code out of lounge.js
  • Loading branch information
@xPaw
xPaw committed Sep 11, 2017
2 parents 2d61c01 + 17127e9 commit 8de7f44
Show file tree
Hide file tree
Showing 4 changed files with 219 additions and 216 deletions.
112 changes: 112 additions & 0 deletions client/js/keybinds.js
View file
@@ -0,0 +1,112 @@
"use strict";

const $ = require("jquery");
const Mousetrap = require("mousetrap");
const utils = require("./utils");
const input = $("#input");
const sidebar = $("#sidebar");
const windows = $("#windows");
const contextMenuContainer = $("#context-menu-container");

Mousetrap.bind([
"pageup",
"pagedown"
], function(e, key) {
let container = windows.find(".window.active");

// Chat windows scroll message container
if (container.attr("id") === "chat-container") {
container = container.find(".chan.active .chat");
}

container.finish();

const offset = container.get(0).clientHeight * 0.9;
let scrollTop = container.scrollTop();

if (key === "pageup") {
scrollTop = Math.floor(scrollTop - offset);
} else {
scrollTop = Math.ceil(scrollTop + offset);
}

container.animate({
scrollTop: scrollTop
}, 200);

return false;
});

Mousetrap.bind([
"command+up",
"command+down",
"ctrl+up",
"ctrl+down"
], function(e, keys) {
const channels = sidebar.find(".chan");
const index = channels.index(channels.filter(".active"));
const direction = keys.split("+").pop();
let target;

switch (direction) {
case "up":
target = (channels.length + (index - 1 + channels.length)) % channels.length;
break;

case "down":
target = (channels.length + (index + 1 + channels.length)) % channels.length;
break;
}

channels.eq(target).click();
});

Mousetrap.bind([
"command+shift+l",
"ctrl+shift+l"
], function(e) {
if (e.target === input[0]) {
utils.clear();
e.preventDefault();
}
});

Mousetrap.bind([
"escape"
], function() {
contextMenuContainer.hide();
});

const colorsHotkeys = {
k: "\x03",
b: "\x02",
u: "\x1F",
i: "\x1D",
o: "\x0F",
};

for (const hotkey in colorsHotkeys) {
Mousetrap.bind([
"command+" + hotkey,
"ctrl+" + hotkey
], function(e) {
e.preventDefault();

const cursorPosStart = input.prop("selectionStart");
const cursorPosEnd = input.prop("selectionEnd");
const value = input.val();
let newValue = value.substring(0, cursorPosStart) + colorsHotkeys[e.key];

if (cursorPosStart === cursorPosEnd) {
// If no text is selected, insert at cursor
newValue += value.substring(cursorPosEnd, value.length);
} else {
// If text is selected, insert formatting character at start and the end
newValue += value.substring(cursorPosStart, cursorPosEnd) + colorsHotkeys[e.key] + value.substring(cursorPosEnd, value.length);
}

input
.val(newValue)
.get(0).setSelectionRange(cursorPosStart + 1, cursorPosEnd + 1);
});
}
213 changes: 2 additions & 211 deletions client/js/lounge.js
View file
Expand Up @@ -4,23 +4,22 @@
require("jquery-ui/ui/widgets/sortable");
const $ = require("jquery");
const moment = require("moment");
const Mousetrap = require("mousetrap");
const URI = require("urijs");
const fuzzy = require("fuzzy");

// our libraries
require("./libs/jquery/inputhistory");
require("./libs/jquery/stickyscroll");
const helpers_roundBadgeNumber = require("./libs/handlebars/roundBadgeNumber");
const slideoutMenu = require("./libs/slideout");
const templates = require("../views");
const socket = require("./socket");
require("./socket-events");
const storage = require("./localStorage");
const options = require("./options");
require("./options");
const utils = require("./utils");
require("./autocompletion");
require("./webpush");
require("./keybinds");
require("./clipboard");

$(function() {
Expand All @@ -29,20 +28,6 @@ $(function() {

$(document.body).data("app-name", document.title);

var pop;
try {
pop = new Audio();
pop.src = "audio/pop.ogg";
} catch (e) {
pop = {
play: $.noop
};
}

$("#play").on("click", function() {
pop.play();
});

var windows = $("#windows");
var viewport = $("#viewport");
var sidebarSlide = slideoutMenu(viewport[0], sidebar[0]);
Expand Down Expand Up @@ -494,95 +479,6 @@ $(function() {
container.html(templates.user_filtered({matches: result})).show();
});

chat.on("msg", ".messages", function(e, target, msg) {
var unread = msg.unread;
msg = msg.msg;

if (msg.self) {
return;
}

var button = sidebar.find(".chan[data-target='" + target + "']");
if (msg.highlight || (options.notifyAllMessages && msg.type === "message")) {
if (!document.hasFocus() || !$(target).hasClass("active")) {
if (options.notification) {
try {
pop.play();
} catch (exception) {
// On mobile, sounds can not be played without user interaction.
}
}
utils.toggleNotificationMarkers(true);

if (options.desktopNotifications && Notification.permission === "granted") {
var title;
var body;

if (msg.type === "invite") {
title = "New channel invite:";
body = msg.from + " invited you to " + msg.channel;
} else {
title = msg.from;
if (!button.hasClass("query")) {
title += " (" + button.data("title").trim() + ")";
}
if (msg.type === "message") {
title += " says:";
}
body = msg.text.replace(/\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?|[\x00-\x1F]|\x7F/g, "").trim();
}

try {
var notify = new Notification(title, {
body: body,
icon: "img/logo-64.png",
tag: target
});
notify.addEventListener("click", function() {
window.focus();
button.click();
this.close();
});
} catch (exception) {
// `new Notification(...)` is not supported and should be silenced.
}
}
}
}

if (button.hasClass("active")) {
return;
}

if (!unread) {
return;
}

var badge = button.find(".badge").html(helpers_roundBadgeNumber(unread));

if (msg.highlight) {
badge.addClass("highlight");
}
});

chat.on("click", ".show-more-button", function() {
var self = $(this);
var lastMessage = self.parent().next(".messages").children(".msg").first();
if (lastMessage.is(".condensed")) {
lastMessage = lastMessage.children(".msg").first();
}
var lastMessageId = parseInt(lastMessage[0].id.replace("msg-", ""), 10);

self
.text("Loading older messages…")
.prop("disabled", true);

socket.emit("more", {
target: self.data("id"),
lastId: lastMessageId
});
});

var forms = $("#sign-in, #connect, #change-password");

windows.on("show", "#sign-in", function() {
Expand Down Expand Up @@ -668,111 +564,6 @@ $(function() {
$(this).data("lastvalue", nick);
});

(function HotkeysScope() {
Mousetrap.bind([
"pageup",
"pagedown"
], function(e, key) {
let container = windows.find(".window.active");

// Chat windows scroll message container
if (container.attr("id") === "chat-container") {
container = container.find(".chan.active .chat");
}

container.finish();

const offset = container.get(0).clientHeight * 0.9;
let scrollTop = container.scrollTop();

if (key === "pageup") {
scrollTop = Math.floor(scrollTop - offset);
} else {
scrollTop = Math.ceil(scrollTop + offset);
}

container.animate({
scrollTop: scrollTop
}, 200);

return false;
});

Mousetrap.bind([
"command+up",
"command+down",
"ctrl+up",
"ctrl+down"
], function(e, keys) {
var channels = sidebar.find(".chan");
var index = channels.index(channels.filter(".active"));
var direction = keys.split("+").pop();
switch (direction) {
case "up":
// Loop
var upTarget = (channels.length + (index - 1 + channels.length)) % channels.length;
channels.eq(upTarget).click();
break;

case "down":
// Loop
var downTarget = (channels.length + (index + 1 + channels.length)) % channels.length;
channels.eq(downTarget).click();
break;
}
});

Mousetrap.bind([
"command+shift+l",
"ctrl+shift+l"
], function(e) {
if (e.target === input[0]) {
utils.clear();
e.preventDefault();
}
});

Mousetrap.bind([
"escape"
], function() {
contextMenuContainer.hide();
});

var colorsHotkeys = {
k: "\x03",
b: "\x02",
u: "\x1F",
i: "\x1D",
o: "\x0F",
};

for (var hotkey in colorsHotkeys) {
Mousetrap.bind([
"command+" + hotkey,
"ctrl+" + hotkey
], function(e) {
e.preventDefault();

const cursorPosStart = input.prop("selectionStart");
const cursorPosEnd = input.prop("selectionEnd");
const value = input.val();
let newValue = value.substring(0, cursorPosStart) + colorsHotkeys[e.key];

if (cursorPosStart === cursorPosEnd) {
// If no text is selected, insert at cursor
newValue += value.substring(cursorPosEnd, value.length);
} else {
// If text is selected, insert formatting character at start and the end
newValue += value.substring(cursorPosStart, cursorPosEnd) + colorsHotkeys[e.key] + value.substring(cursorPosEnd, value.length);
}

input
.val(newValue)
.get(0).setSelectionRange(cursorPosStart + 1, cursorPosEnd + 1);
});
}
}());

$(document).on("visibilitychange focus click", () => {
if (sidebar.find(".highlight").length === 0) {
utils.toggleNotificationMarkers(false);
Expand Down
18 changes: 18 additions & 0 deletions client/js/socket-events/more.js
View file
Expand Up @@ -54,3 +54,21 @@ socket.on("more", function(data) {
.text("Show older messages")
.prop("disabled", false);
});

chat.on("click", ".show-more-button", function() {
var self = $(this);
var lastMessage = self.parent().next(".messages").children(".msg").first();
if (lastMessage.is(".condensed")) {
lastMessage = lastMessage.children(".msg").first();
}
var lastMessageId = parseInt(lastMessage[0].id.replace("msg-", ""), 10);

self
.text("Loading older messages…")
.prop("disabled", true);

socket.emit("more", {
target: self.data("id"),
lastId: lastMessageId
});
});

0 comments on commit 8de7f44

Please sign in to comment.