Merge branch 'develop' of github.com:ether/etherpad-lite into develop
This commit is contained in:
commit
778f2d3f80
|
@ -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"});
|
||||
top.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 */
|
||||
specialHandled = true;
|
||||
}
|
||||
|
|
|
@ -195,7 +195,9 @@
|
|||
<div id="wrongPassword">
|
||||
<p data-l10n-id="pad.wrongPassword">Your password was wrong</p>
|
||||
</div>
|
||||
<% e.begin_block("loading"); %>
|
||||
<p data-l10n-id="pad.loading" id="loading">Loading...</p>
|
||||
<% e.end_block(); %>
|
||||
<noscript><strong>Sorry, you have to enable Javascript in order to use this.</strong></noscript>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue