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

Merge 0953a5ac33 into e87843c5ae

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2013-02-11 12:52:28 -08:00
commit f14c9d2006
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1086,7 +1086,7 @@ function Ace2Inner(){
{
if (scheduledTimeout)
{
clearTimeout(scheduledTimeout);
scheduler.clearTimeout(scheduledTimeout);
scheduledTimeout = null;
}
}

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

@ -51,7 +51,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
// and if there isn't a timeout already scheduled.
if (changeCallback && changeCallbackTimeout === null)
{
changeCallbackTimeout = setTimeout(function()
changeCallbackTimeout = scheduler.setTimeout(function()
{
try
{