summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuiza Pagliari <lpagliari@gmail.com>2017-05-03 12:59:57 -0300
committerLuiza Pagliari <lpagliari@gmail.com>2017-05-03 12:59:57 -0300
commit0bd41696632f3d15d664253fdf598d6b9746bcff (patch)
tree3580d252b45045a14e0e43f600933d2663c4b938 /src
parent32ed4315e2a3c2512d1434c7764391c55d265317 (diff)
downloadetherpad-lite-0bd41696632f3d15d664253fdf598d6b9746bcff.zip
[fix] Block user from changing pad after he/she is disconnected
Use same approach of when channel state is chaged to "DISCONNECTED".
Diffstat (limited to 'src')
-rw-r--r--src/static/js/pad.js44
1 files changed, 25 insertions, 19 deletions
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index c967e461..4fefadf3 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -1,5 +1,5 @@
/**
- * This code is mostly from the old Etherpad. Please help us to comment this code.
+ * This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
*/
@@ -99,15 +99,15 @@ function getParams()
setting.callback(value);
}
}
-
+
// Then URL applied stuff
var params = getUrlVars()
-
+
for(var i = 0; i < getParameters.length; i++)
{
var setting = getParameters[i];
var value = params[setting.name];
-
+
if(value && (value == setting.checkVal || setting.checkVal == null))
{
setting.callback(value);
@@ -156,7 +156,7 @@ function sendClientReady(isReconnect, messageType)
token = "t." + randomString();
createCookie("token", token, 60);
}
-
+
var sessionID = decodeURIComponent(readCookie("sessionID"));
var password = readCookie("password");
@@ -169,14 +169,14 @@ function sendClientReady(isReconnect, messageType)
"token": token,
"protocolVersion": 2
};
-
+
//this is a reconnect, lets tell the server our revisionnumber
if(isReconnect == true)
{
msg.client_rev=pad.collabClient.getCurrentRevisionNumber();
msg.reconnect=true;
}
-
+
socket.json.send(msg);
}
@@ -203,12 +203,12 @@ function handshake()
socket.once('connect', function () {
sendClientReady(false);
});
-
+
socket.on('reconnect', function () {
pad.collabClient.setChannelState("CONNECTED");
pad.sendClientReady(true);
});
-
+
socket.on('reconnecting', function() {
pad.collabClient.setChannelState("RECONNECTING");
});
@@ -254,7 +254,7 @@ function handshake()
$("#passwordinput").focus();
}
}
-
+
//if we haven't recieved the clientVars yet, then this message should it be
else if (!receivedClientVars && obj.type == "CLIENT_VARS")
{
@@ -267,7 +267,7 @@ function handshake()
clientVars = obj.data;
clientVars.userAgent = "Anonymous";
clientVars.collab_client_vars.clientAgent = "Anonymous";
-
+
//initalize the pad
pad._afterHandshake();
initalized = true;
@@ -298,7 +298,7 @@ function handshake()
{
pad.changeViewOption('noColors', true);
}
-
+
if (settings.rtlIsTrue == true)
{
pad.changeViewOption('rtlIsTrue', true);
@@ -335,6 +335,12 @@ function handshake()
console.warn(obj);
padconnectionstatus.disconnected(obj.disconnect);
socket.disconnect();
+
+ // block user from making any change to the pad
+ padeditor.disable();
+ padeditbar.disable();
+ padimpexp.disable();
+
return;
}
else
@@ -345,13 +351,13 @@ function handshake()
});
// Bind the colorpicker
var fb = $('#colorpicker').farbtastic({ callback: '#mycolorpickerpreview', width: 220});
- // Bind the read only button
+ // Bind the read only button
$('#readonlyinput').on('click',function(){
padeditbar.setEmbedLinks();
});
}
-$.extend($.gritter.options, {
+$.extend($.gritter.options, {
position: 'bottom-right', // defaults to 'top-right' but can be 'bottom-left', 'bottom-right', 'top-left', 'top-right' (added in 1.7.1)
fade: false, // dont fade, too jerky on mobile
time: 6000 // hang on the screen for...
@@ -424,7 +430,7 @@ var pad = {
if(window.history && window.history.pushState)
{
$('#chattext p').remove(); //clear the chat messages
- window.history.pushState("", "", newHref);
+ window.history.pushState("", "", newHref);
receivedClientVars = false;
sendClientReady(false, 'SWITCH_TO_PAD');
}
@@ -731,20 +737,20 @@ var pad = {
pad.diagnosticInfo.disconnectedMessage = message;
pad.diagnosticInfo.padId = pad.getPadId();
pad.diagnosticInfo.socket = {};
-
- //we filter non objects from the socket object and put them in the diagnosticInfo
+
+ //we filter non objects from the socket object and put them in the diagnosticInfo
//this ensures we have no cyclic data - this allows us to stringify the data
for(var i in socket.socket)
{
var value = socket.socket[i];
var type = typeof value;
-
+
if(type == "string" || type == "number")
{
pad.diagnosticInfo.socket[i] = value;
}
}
-
+
pad.asyncSendDiagnosticInfo();
if (typeof window.ajlog == "string")
{