mirror of
https://github.com/thelounge/thelounge.git
synced 2024-06-11 10:12:19 +02:00
Merge pull request #810 from thelounge/xpaw/color-hotkeys
Implement color hotkeys
This commit is contained in:
Pavel Djundik
GitHub
commit
212703d162
|
|
@ -390,6 +390,62 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>Ctrl</kbd> + <kbd>K</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>
|
||||||
|
Mark any text typed after this shortcut to be colored. After
|
||||||
|
hitting this shortcut, enter an integer in the
|
||||||
|
<code>0—15</code> range to select the desired color.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
A color reference can be found
|
||||||
|
<a href="http://www.mirc.com/colors.html" target="_blank">here</a>.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>Ctrl</kbd> + <kbd>B</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>Mark all text typed after this shortcut as bold.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>Ctrl</kbd> + <kbd>U</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>Mark all text typed after this shortcut as underlined.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>Ctrl</kbd> + <kbd>I</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>Mark all text typed after this shortcut as italics.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>Ctrl</kbd> + <kbd>O</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>
|
||||||
|
Mark all text typed after this shortcut to be reset to its
|
||||||
|
original formatting.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<h3>On macOS</h3>
|
<h3>On macOS</h3>
|
||||||
|
|
||||||
<div class="help-item">
|
<div class="help-item">
|
||||||
|
|
@ -403,13 +459,69 @@
|
||||||
|
|
||||||
<div class="help-item">
|
<div class="help-item">
|
||||||
<div class="subject">
|
<div class="subject">
|
||||||
<kbd>⌘</kbd> + <kbd>K</kbd>
|
<kbd>⇧</kbd> + <kbd>⌘</kbd> + <kbd>L</kbd>
|
||||||
</div>
|
</div>
|
||||||
<div class="description">
|
<div class="description">
|
||||||
<p>Clear the current screen</p>
|
<p>Clear the current screen</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>⌘</kbd> + <kbd>K</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>
|
||||||
|
Mark any text typed after this shortcut to be colored. After
|
||||||
|
hitting this shortcut, enter an integer in the
|
||||||
|
<code>0—15</code> range to select the desired color.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
A color reference can be found
|
||||||
|
<a href="http://www.mirc.com/colors.html" target="_blank">here</a>.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>⌘</kbd> + <kbd>B</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>Mark all text typed after this shortcut as bold.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>⌘</kbd> + <kbd>U</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>Mark all text typed after this shortcut as underlined.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>⌘</kbd> + <kbd>I</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>Mark all text typed after this shortcut as italics.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="help-item">
|
||||||
|
<div class="subject">
|
||||||
|
<kbd>⌘</kbd> + <kbd>O</kbd>
|
||||||
|
</div>
|
||||||
|
<div class="description">
|
||||||
|
<p>
|
||||||
|
Mark all text typed after this shortcut to be reset to its
|
||||||
|
original formatting.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<h2>Commands</h2>
|
<h2>Commands</h2>
|
||||||
|
|
||||||
<p>All commands can be autocompleted with <kbd>tab</kbd>.</p>
|
<p>All commands can be autocompleted with <kbd>tab</kbd>.</p>
|
||||||
|
|
@ -463,7 +575,7 @@
|
||||||
<p>
|
<p>
|
||||||
Send a <abbr title="Client-to-client protocol">CTCP</abbr>
|
Send a <abbr title="Client-to-client protocol">CTCP</abbr>
|
||||||
request. Read more about this on
|
request. Read more about this on
|
||||||
<a href="https://en.wikipedia.org/wiki/Client-to-client_protocol">the dedicated Wikipedia article</a>.
|
<a href="https://en.wikipedia.org/wiki/Client-to-client_protocol" target="_blank">the dedicated Wikipedia article</a>.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -1300,45 +1300,81 @@ $(function() {
|
||||||
$(this).data("lastvalue", nick);
|
$(this).data("lastvalue", nick);
|
||||||
});
|
});
|
||||||
|
|
||||||
Mousetrap.bind([
|
(function HotkeysScope() {
|
||||||
"command+up",
|
Mousetrap.bind([
|
||||||
"command+down",
|
"command+up",
|
||||||
"ctrl+up",
|
"command+down",
|
||||||
"ctrl+down"
|
"ctrl+up",
|
||||||
], function(e, keys) {
|
"ctrl+down"
|
||||||
var channels = sidebar.find(".chan");
|
], function(e, keys) {
|
||||||
var index = channels.index(channels.filter(".active"));
|
var channels = sidebar.find(".chan");
|
||||||
var direction = keys.split("+").pop();
|
var index = channels.index(channels.filter(".active"));
|
||||||
switch (direction) {
|
var direction = keys.split("+").pop();
|
||||||
case "up":
|
switch (direction) {
|
||||||
// Loop
|
case "up":
|
||||||
var upTarget = (channels.length + (index - 1 + channels.length)) % channels.length;
|
// Loop
|
||||||
channels.eq(upTarget).click();
|
var upTarget = (channels.length + (index - 1 + channels.length)) % channels.length;
|
||||||
break;
|
channels.eq(upTarget).click();
|
||||||
|
break;
|
||||||
|
|
||||||
case "down":
|
case "down":
|
||||||
// Loop
|
// Loop
|
||||||
var downTarget = (channels.length + (index + 1 + channels.length)) % channels.length;
|
var downTarget = (channels.length + (index + 1 + channels.length)) % channels.length;
|
||||||
channels.eq(downTarget).click();
|
channels.eq(downTarget).click();
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Mousetrap.bind([
|
||||||
|
"command+shift+l",
|
||||||
|
"ctrl+shift+l"
|
||||||
|
], function(e) {
|
||||||
|
if (e.target === input[0]) {
|
||||||
|
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);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
}());
|
||||||
|
|
||||||
Mousetrap.bind([
|
|
||||||
"command+k",
|
|
||||||
"ctrl+shift+l"
|
|
||||||
], function(e) {
|
|
||||||
if (e.target === input[0]) {
|
|
||||||
clear();
|
|
||||||
e.preventDefault();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Mousetrap.bind([
|
|
||||||
"escape"
|
|
||||||
], function() {
|
|
||||||
contextMenuContainer.hide();
|
|
||||||
});
|
|
||||||
|
|
||||||
setInterval(function() {
|
setInterval(function() {
|
||||||
chat.find(".chan:not(.active)").each(function() {
|
chat.find(".chan:not(.active)").each(function() {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue