mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[fix] Block user from changing pad after he/she is disconnected

Browse source 
Use same approach of when channel state is chaged to "DISCONNECTED".
This commit is contained in:
Luiza Pagliari 2017-05-03 12:59:57 -03:00
parent 32ed4315e2
commit 0bd4169663
2 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/static/js/pad.js
View file

@ -335,6 +335,12 @@ function handshake()
console.warn(obj); console.warn(obj);
padconnectionstatus.disconnected(obj.disconnect); padconnectionstatus.disconnected(obj.disconnect);
socket.disconnect(); socket.disconnect();
// block user from making any change to the pad
padeditor.disable();
padeditbar.disable();
padimpexp.disable();
return; return;
} }
else else

13
tests/frontend/specs/automatic_reconnect.js
View file

@ -33,6 +33,19 @@ describe('Automatic pad reload on Force Reconnect message', function() {
done(); done();
}); });
it('disables editor', function(done) {
var editorDocument = helper.padOuter$("iframe[name='ace_inner']").get(0).contentDocument;
var editorBody = editorDocument.getElementById('innerdocbody');
var editorIsEditable = editorBody.contentEditable === 'false' // IE/Safari
|| editorDocument.designMode === 'off'; // other browsers
expect(editorIsEditable).to.be(true);
done();
});
context('and user clicks on Cancel', function() { context('and user clicks on Cancel', function() {
beforeEach(function() { beforeEach(function() {
var $errorMessageModal = helper.padChrome$('#connectivity .userdup'); var $errorMessageModal = helper.padChrome$('#connectivity .userdup');