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

Merge pull request #1503 from ether/feature/ffFixes 

Brought scheduler back completly, fixes #1502
This commit is contained in:
John McLear 2013-02-11 14:05:24 -08:00
parent e87843c5ae 0953a5ac33
commit 00af6d9c6a
2 changed files with 2 additions and 2 deletions
Show Stats 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
{