libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

Browse source
This commit is contained in:
John McLear 2014-11-12 21:38:14 +00:00
commit 62a2f7a1cc
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/locales/en.json
View file

@ -12,7 +12,7 @@
"pad.toolbar.unindent.title": "Outdent (Shift+TAB)", "pad.toolbar.unindent.title": "Outdent (Shift+TAB)",
"pad.toolbar.undo.title": "Undo (Ctrl+Z)", "pad.toolbar.undo.title": "Undo (Ctrl+Z)",
"pad.toolbar.redo.title": "Redo (Ctrl+Y)", "pad.toolbar.redo.title": "Redo (Ctrl+Y)",
"pad.toolbar.clearAuthorship.title": "Clear Authorship Colors", "pad.toolbar.clearAuthorship.title": "Clear Authorship Colors (Ctrl+Shift+C)",
"pad.toolbar.import_export.title": "Import/Export from/to different file formats", "pad.toolbar.import_export.title": "Import/Export from/to different file formats",
"pad.toolbar.timeslider.title": "Timeslider", "pad.toolbar.timeslider.title": "Timeslider",
"pad.toolbar.savedRevision.title": "Save Revision", "pad.toolbar.savedRevision.title": "Save Revision",

2
src/package.json
View file

@ -16,7 +16,7 @@
"require-kernel" : "1.0.5", "require-kernel" : "1.0.5",
"resolve" : ">=1.0.0", "resolve" : ">=1.0.0",
"socket.io" : "0.9.x", "socket.io" : "0.9.x",
"ueberDB" : ">=0.2.6", "ueberDB" : ">=0.2.9",
"express" : "3.1.0", "express" : "3.1.0",
"async" : "0.1.x", "async" : "0.1.x",
"connect" : "2.7.x", "connect" : "2.7.x",

1
src/static/css/timeslider.css
View file

@ -173,6 +173,7 @@
#import_export { #import_export {
top: 115px; top: 115px;
width: 185px; width: 185px;
position: fixed;
} }
.timeslider-bar { .timeslider-bar {
background: #f7f7f7; background: #f7f7f7;

10
src/static/js/ace2_inner.js
View file

@ -3757,7 +3757,7 @@ function Ace2Inner(){
doInsertUnorderedList() doInsertUnorderedList()
specialHandled = true; specialHandled = true;
} }
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "n" && (evt.metaKey || evt.ctrlKey) && evt.shiftKey) if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "n" && (evt.metaKey || evt.ctrlKey) && evt.shiftKey)
{ {
// cmd-shift-N (orderedlist) // cmd-shift-N (orderedlist)
fastIncorp(9); fastIncorp(9);
@ -3765,6 +3765,12 @@ function Ace2Inner(){
doInsertOrderedList() doInsertOrderedList()
specialHandled = true; specialHandled = true;
} }
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "c" && (evt.metaKey || evt.ctrlKey) && evt.shiftKey) {
// cmd-shift-C (clearauthorship)
fastIncorp(9);
evt.preventDefault();
CMDS.clearauthorship();
}
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)
@ -3816,7 +3822,7 @@ function Ace2Inner(){
} }
updateBrowserSelectionFromRep(); updateBrowserSelectionFromRep();
var myselection = document.getSelection(); // get the current caret selection, can't use rep. here because that only gives us the start position not the current var myselection = document.getSelection(); // get the current caret selection, can't use rep. here because that only gives us the start position not the current
var caretOffsetTop = myselection.focusNode.parentNode.offsetTop | myselection.focusNode.offsetTop; // get the carets selection offset in px IE 214 var caretOffsetTop = myselection.focusNode.parentNode.offsetTop || myselection.focusNode.offsetTop; // get the carets selection offset in px IE 214
// top.console.log(caretOffsetTop); // top.console.log(caretOffsetTop);
setScrollY(caretOffsetTop); // set the scrollY offset of the viewport on the document setScrollY(caretOffsetTop); // set the scrollY offset of the viewport on the document