From c48917720699fb1e4b304a464978f016f1967531 Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 28 Mar 2013 02:24:59 +0000 Subject: [PATCH 1/5] show light yellow for .5 secs on save revision keypress --- src/static/js/ace2_inner.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index fc69d5921..e00d2ee72 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3649,6 +3649,11 @@ function Ace2Inner(){ if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "s" && (evt.metaKey || evt.ctrlKey)) /* Do a saved revision on ctrl S */ { evt.preventDefault(); + var originalBackground = parent.parent.$('#revisionlink').css("background") + parent.parent.$('#revisionlink').css({"background":"lightyellow"}); + setTimeout(function(){ + parent.parent.$('#revisionlink').css({"background":originalBackground}); + }, 500); parent.parent.pad.collabClient.sendMessage({"type":"SAVE_REVISION"}); /* The parent.parent part of this is BAD and I feel bad.. It may break something */ specialHandled = true; } From 59a9ff404d1be02ccb051eabdd487117e789a04b Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 28 Mar 2013 13:18:55 +0000 Subject: [PATCH 2/5] more settimeout to top window --- src/static/js/ace2_inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index e00d2ee72..1ab026efb 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"}); - setTimeout(function(){ + top.setTimeout(function(){ parent.parent.$('#revisionlink').css({"background":originalBackground}); }, 500); parent.parent.pad.collabClient.sendMessage({"type":"SAVE_REVISION"}); /* The parent.parent part of this is BAD and I feel bad.. It may break something */ From 0ff5137da3b1b6396e1b489cee90525664b9188d Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Thu, 28 Mar 2013 16:39:33 +0100 Subject: [PATCH 3/5] Make revision button glow on ctrl-s and increase duration --- src/static/js/ace2_inner.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 1ab026efb..cbae0be90 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3650,10 +3650,10 @@ function Ace2Inner(){ { evt.preventDefault(); var originalBackground = parent.parent.$('#revisionlink').css("background") - parent.parent.$('#revisionlink').css({"background":"lightyellow"}); + parent.parent.$('#revisionlink').css({"background":"lightyellow", 'box-shadow': '0 0 50px yellow'}); top.setTimeout(function(){ - parent.parent.$('#revisionlink').css({"background":originalBackground}); - }, 500); + parent.parent.$('#revisionlink').css({"background":originalBackground, 'box-shadow': 'none'}); + }, 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 */ specialHandled = true; } From d73ea4e334ed3345ceaf110db4b1d71737d7db8e Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 29 Mar 2013 02:24:15 +0000 Subject: [PATCH 4/5] Loading blocks --- src/templates/pad.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/templates/pad.html b/src/templates/pad.html index 1d8c069a5..ef621545b 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -195,7 +195,9 @@

Your password was wrong

+ <% e.begin_block("loading"); %>

Loading...

+ <% e.end_block(); %> From c67c7ca746fda220b15d05d913a2b74a00332377 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 29 Mar 2013 03:09:10 +0000 Subject: [PATCH 5/5] remove messy bits --- src/static/js/ace2_inner.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index cbae0be90..46b308ce1 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3650,9 +3650,9 @@ function Ace2Inner(){ { evt.preventDefault(); var originalBackground = parent.parent.$('#revisionlink').css("background") - parent.parent.$('#revisionlink').css({"background":"lightyellow", 'box-shadow': '0 0 50px yellow'}); + parent.parent.$('#revisionlink').css({"background":"lightyellow"}); top.setTimeout(function(){ - parent.parent.$('#revisionlink').css({"background":originalBackground, 'box-shadow': 'none'}); + 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 */ specialHandled = true;