fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987 

A quick search revealed that 'Ctrl-5' is a popular shortcut
for strikethrough. Implemented in 'ace2_inner' and updated
the English l10n file for the tooltip.
This commit is contained in:
Prateek Saxena 2014-10-11 22:46:01 +05:30
parent 6ec55309a7
commit 001d75cd1e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/locales/en.json
View File

@ -5,7 +5,7 @@
"pad.toolbar.bold.title": "Bold (Ctrl-B)", "pad.toolbar.bold.title": "Bold (Ctrl-B)",
"pad.toolbar.italic.title": "Italic (Ctrl-I)", "pad.toolbar.italic.title": "Italic (Ctrl-I)",
"pad.toolbar.underline.title": "Underline (Ctrl-U)", "pad.toolbar.underline.title": "Underline (Ctrl-U)",
"pad.toolbar.strikethrough.title": "Strikethrough", "pad.toolbar.strikethrough.title": "Strikethrough (Ctrl-5)",
"pad.toolbar.ol.title": "Ordered list", "pad.toolbar.ol.title": "Ordered list",
"pad.toolbar.ul.title": "Unordered List", "pad.toolbar.ul.title": "Unordered List",
"pad.toolbar.indent.title": "Indent (TAB)", "pad.toolbar.indent.title": "Indent (TAB)",
@ -85,7 +85,7 @@
"pad.modals.disconnected": "You have been disconnected.", "pad.modals.disconnected": "You have been disconnected.",
"pad.modals.disconnected.explanation": "The connection to the server was lost", "pad.modals.disconnected.explanation": "The connection to the server was lost",
"pad.modals.disconnected.cause": "The server may be unavailable. Please notify the service administrator if this continues to happen.", "pad.modals.disconnected.cause": "The server may be unavailable. Please notify the service administrator if this continues to happen.",
"pad.share": "Share this pad", "pad.share": "Share this pad",
"pad.share.readonly": "Read only", "pad.share.readonly": "Read only",
"pad.share.link": "Link", "pad.share.link": "Link",

12
src/static/js/ace2_inner.js
View File

@ -2333,7 +2333,7 @@ function Ace2Inner(){
if(rep.selStart[1] == rep.selEnd[1] && rep.selStart[1] == rep.lines.atIndex(n).text.length){ if(rep.selStart[1] == rep.selEnd[1] && rep.selStart[1] == rep.lines.atIndex(n).text.length){
return false; // If we're at the end of a line we treat it as having no formatting return false; // If we're at the end of a line we treat it as having no formatting
} }
if(rep.selStart[1] == 0 && rep.selEnd[1] == 0){ if(rep.selStart[1] == 0 && rep.selEnd[1] == 0){
rep.selEnd[1] == 1; rep.selEnd[1] == 1;
} }
if(rep.selEnd[1] == -1){ if(rep.selEnd[1] == -1){
@ -3741,6 +3741,14 @@ function Ace2Inner(){
toggleAttributeOnSelection('underline'); toggleAttributeOnSelection('underline');
specialHandled = true; specialHandled = true;
} }
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "5" && (evt.metaKey || evt.ctrlKey))
{
// cmd-5 (strikethrough)
fastIncorp(13);
evt.preventDefault();
toggleAttributeOnSelection('strikethrough');
specialHandled = true;
}
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "h" && (evt.ctrlKey)) if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "h" && (evt.ctrlKey))
{ {
// cmd-H (backspace) // cmd-H (backspace)
@ -3818,7 +3826,7 @@ function Ace2Inner(){
// top.console.log(caretOffsetTop, viewport.top, caretOffsetTopBottom, viewport.bottom); // top.console.log(caretOffsetTop, viewport.top, caretOffsetTopBottom, viewport.bottom);
var caretIsNotVisible = (caretOffsetTop < viewport.top || caretOffsetTopBottom >= viewport.bottom); // Is the Caret Visible to the user? var caretIsNotVisible = (caretOffsetTop < viewport.top || caretOffsetTopBottom >= viewport.bottom); // Is the Caret Visible to the user?
// Expect some weird behavior caretOffsetTopBottom is greater than viewport.bottom on a keypress down // Expect some weird behavior caretOffsetTopBottom is greater than viewport.bottom on a keypress down
var offsetTopSamePlace = caretOffsetTop == viewport.top; // sometimes moving key left & up leaves the caret at the same point as the viewport.top, technically the caret is visible but it's not fully visible so we should move to it var offsetTopSamePlace = caretOffsetTop == viewport.top; // sometimes moving key left & up leaves the caret at the same point as the viewport.top, technically the caret is visible but it's not fully visible so we should move to it
if(offsetTopSamePlace && (evt.which == 37 || evt.which == 38)){ if(offsetTopSamePlace && (evt.which == 37 || evt.which == 38)){
var newY = caretOffsetTop; var newY = caretOffsetTop;
setScrollY(newY); setScrollY(newY);