mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 08:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Support Page Up and Page Down in ace

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2013-02-03 17:39:49 +00:00
parent cba001341f
commit eaa835630c
2 changed files with 53 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,7 +154,12 @@ function Ace2Inner(){
var dmesg = noop; var dmesg = noop;
window.dmesg = noop; window.dmesg = noop;
var scheduler = parent; // Ugly hack for Firefox 18
// get the timeout and interval methods from the parent iframe
setTimeout = parent.setTimeout;
clearTimeout = parent.clearTimeout;
setInterval = parent.setInterval;
clearInterval = parent.clearInterval;
var textFace = 'monospace'; var textFace = 'monospace';
var textSize = 12; var textSize = 12;
@ -174,7 +179,7 @@ function Ace2Inner(){
parentDynamicCSS = makeCSSManager("dynamicsyntax", true); parentDynamicCSS = makeCSSManager("dynamicsyntax", true);
} }
var changesetTracker = makeChangesetTracker(scheduler, rep.apool, { var changesetTracker = makeChangesetTracker(rep.apool, {
withCallbacks: function(operationName, f) withCallbacks: function(operationName, f)
{ {
inCallStackIfNecessary(operationName, function() inCallStackIfNecessary(operationName, function()
@ -594,7 +599,7 @@ function Ace2Inner(){
doesWrap = newVal; doesWrap = newVal;
var dwClass = "doesWrap"; var dwClass = "doesWrap";
setClassPresence(root, "doesWrap", doesWrap); setClassPresence(root, "doesWrap", doesWrap);
scheduler.setTimeout(function() setTimeout(function()
{ {
inCallStackIfNecessary("setWraps", function() inCallStackIfNecessary("setWraps", function()
{ {
@ -634,7 +639,7 @@ function Ace2Inner(){
textFace = face; textFace = face;
root.style.fontFamily = textFace; root.style.fontFamily = textFace;
lineMetricsDiv.style.fontFamily = textFace; lineMetricsDiv.style.fontFamily = textFace;
scheduler.setTimeout(function() setTimeout(function()
{ {
setUpTrackingCSS(); setUpTrackingCSS();
}, 0); }, 0);
@ -647,7 +652,7 @@ function Ace2Inner(){
root.style.lineHeight = textLineHeight() + "px"; root.style.lineHeight = textLineHeight() + "px";
sideDiv.style.lineHeight = textLineHeight() + "px"; sideDiv.style.lineHeight = textLineHeight() + "px";
lineMetricsDiv.style.fontSize = textSize + "px"; lineMetricsDiv.style.fontSize = textSize + "px";
scheduler.setTimeout(function() setTimeout(function()
{ {
setUpTrackingCSS(); setUpTrackingCSS();
}, 0); }, 0);
@ -1085,7 +1090,7 @@ function Ace2Inner(){
{ {
if (scheduledTimeout) if (scheduledTimeout)
{ {
scheduler.clearTimeout(scheduledTimeout); clearTimeout(scheduledTimeout);
scheduledTimeout = null; scheduledTimeout = null;
} }
} }
@ -1096,7 +1101,7 @@ function Ace2Inner(){
scheduledTime = time; scheduledTime = time;
var delay = time - now(); var delay = time - now();
if (delay < 0) delay = 0; if (delay < 0) delay = 0;
scheduledTimeout = scheduler.setTimeout(callback, delay); scheduledTimeout = setTimeout(callback, delay);
} }
function callback() function callback()
@ -3613,7 +3618,7 @@ function Ace2Inner(){
evt.preventDefault(); evt.preventDefault();
doReturnKey(); doReturnKey();
//scrollSelectionIntoView(); //scrollSelectionIntoView();
scheduler.setTimeout(function() setTimeout(function()
{ {
outerWin.scrollBy(-100, 0); outerWin.scrollBy(-100, 0);
}, 0); }, 0);
@ -3689,6 +3694,42 @@ function Ace2Inner(){
doDeleteKey(); doDeleteKey();
specialHandled = true; specialHandled = true;
} }
if((evt.which == 33 || evt.which == 34) && type == 'keydown'){
var oldVisibleLineRange = getVisibleLineRange();
var topOffset = rep.selStart[0] - oldVisibleLineRange[0];
if(topOffset < 0 ){
topOffset = 0;
}
var isPageDown = evt.which === 34;
var isPageUp = evt.which === 33;
setTimeout(function(){
var newVisibleLineRange = getVisibleLineRange();
var linesCount = rep.lines.length();
var newCaretRow = rep.selStart[0];
if(isPageUp){
newCaretRow = oldVisibleLineRange[0];
}
if(isPageDown){
newCaretRow = newVisibleLineRange[0] + topOffset;
}
//ensure min and max
if(newCaretRow < 0){
newCaretRow = 0;
}
if(newCaretRow >= linesCount){
newCaretRow = linesCount-1;
}
rep.selStart[0] = newCaretRow;
rep.selEnd[0] = newCaretRow;
updateBrowserSelectionFromRep();
}, 200);
}
} }
if (type == "keydown") if (type == "keydown")
@ -4720,7 +4761,7 @@ function Ace2Inner(){
}); });
scheduler.setTimeout(function() setTimeout(function()
{ {
parent.readyFunc(); // defined in code that sets up the inner iframe parent.readyFunc(); // defined in code that sets up the inner iframe
}, 0); }, 0);
@ -5168,7 +5209,7 @@ function Ace2Inner(){
documentAttributeManager: documentAttributeManager documentAttributeManager: documentAttributeManager
}); });
scheduler.setTimeout(function() setTimeout(function()
{ {
parent.readyFunc(); // defined in code that sets up the inner iframe parent.readyFunc(); // defined in code that sets up the inner iframe
}, 0); }, 0);

4
src/static/js/changesettracker.js
View file

@ -23,7 +23,7 @@
var AttributePool = require('./AttributePool'); var AttributePool = require('./AttributePool');
var Changeset = require('./Changeset'); var Changeset = require('./Changeset');
function makeChangesetTracker(scheduler, apool, aceCallbacksProvider) function makeChangesetTracker(apool, aceCallbacksProvider)
{ {
// latest official text from server // latest official text from server
@ -51,7 +51,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
// and if there isn't a timeout already scheduled. // and if there isn't a timeout already scheduled.
if (changeCallback && changeCallbackTimeout === null) if (changeCallback && changeCallbackTimeout === null)
{ {
changeCallbackTimeout = scheduler.setTimeout(function() changeCallbackTimeout = setTimeout(function()
{ {
try try
{ {