summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2013-04-04 11:02:40 -0700
committerJohn McLear <john@mclear.co.uk>2013-04-04 11:02:40 -0700
commit7805e83b7f2ae7fe6f1e8f612db154eaa6c99236 (patch)
tree514aa0fa3385d17fce60ea89dbd9f51b1eef1534 /src
parent38f7253d311f3fdf95fa72f6b7a6669dba2d3cc1 (diff)
parent380821781f1fe5e8309ff58dde095d4add91ee1f (diff)
downloadetherpad-lite-7805e83b7f2ae7fe6f1e8f612db154eaa6c99236.zip
Merge pull request #1705 from ether/ctrl-s-top
dont use top, use the scheduler
Diffstat (limited to 'src')
-rw-r--r--src/static/js/ace2_inner.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index cfe24ccd..067b546b 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3651,7 +3651,7 @@ function Ace2Inner(){
evt.preventDefault();
var originalBackground = parent.parent.$('#revisionlink').css("background")
parent.parent.$('#revisionlink').css({"background":"lightyellow"});
- top.setTimeout(function(){
+ scheduler.setTimeout(function(){
parent.parent.$('#revisionlink').css({"background":originalBackground});
}, 1000);
parent.parent.pad.collabClient.sendMessage({"type":"SAVE_REVISION"}); /* The parent.parent part of this is BAD and I feel bad.. It may break something */