diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js
index 9caa2b0b..fb2a592c 100644
--- a/src/node/utils/Settings.js
+++ b/src/node/utils/Settings.js
@@ -38,6 +38,8 @@ exports.title = "Etherpad Lite";
* The app favicon fully specified url, visible e.g. in the browser window
*/
exports.favicon = "favicon.ico";
+exports.faviconPad = "../" + exports.favicon;
+exports.faviconTimeslider = "../../" + exports.favicon;
/**
* The IP ep-lite should listen to
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index b3bc91a9..da646b7e 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3562,7 +3562,7 @@ function Ace2Inner(){
inCallStackIfNecessary("handleKeyEvent", function()
{
- if (type == "keypress" || (isTypeForSpecialKey && keyCode == 13 /*return*/ ))
+ if (type == "keypress" || (isTypeForSpecialKey && keyCode == 13 || keyCode == 83 /*return*/ ))
{
// in IE, special keys don't send keypress, the keydown does the action
if (!outsideKeyPress(evt))
@@ -3575,7 +3575,6 @@ function Ace2Inner(){
{
outsideKeyDown(evt);
}
-
if (!stopped)
{
var specialHandledInHook = hooks.callAll('aceKeyEvent', {
@@ -3614,6 +3613,12 @@ function Ace2Inner(){
}, 0);
specialHandled = true;
}
+ if ((!specialHandled) && isTypeForSpecialKey && keyCode == 83)
+ {
+ evt.preventDefault();
+ 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;
+ }
if ((!specialHandled) && isTypeForSpecialKey && keyCode == 9 && !(evt.metaKey || evt.ctrlKey))
{
// tab
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 3f3eee4f..c1300d5e 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -32,7 +32,7 @@
-
+