libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

handlers dict needs to be in AuthorizedClient; cleanup

Browse source
This commit is contained in:
s1341 2013-11-23 19:53:10 +02:00
parent e55ef0fe95
commit 95310dafd4
1 changed files with 2 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/static/js/timeslider.js
View file

@ -84,7 +84,7 @@ SocketClient("AuthenticatedSocketClient",
//make sure we have a token //make sure we have a token
this.token = readCookie("token"); this.token = readCookie("token");
if(this.token == null) if(this.token === null)
{ {
this.token = "t." + randomString(); this.token = "t." + randomString();
createCookie("token", this.token, 60); createCookie("token", this.token, 60);
@ -92,6 +92,7 @@ SocketClient("AuthenticatedSocketClient",
this.padID = padID; this.padID = padID;
this.sessionID = decodeURIComponent(readCookie("sessionID")); this.sessionID = decodeURIComponent(readCookie("sessionID"));
this.password = readCookie("password"); this.password = readCookie("password");
this.handlers = {};
this._super(baseurl); this._super(baseurl);
}, },
@ -162,7 +163,6 @@ AuthenticatedSocketClient("TimesliderClient",
{ //instance { //instance
init: function (baseurl, padID) { init: function (baseurl, padID) {
this._super(baseurl, padID); this._super(baseurl, padID);
this.handlers = {};
}, },
onConnect: function (callback) { onConnect: function (callback) {
@ -247,38 +247,6 @@ function init(baseURL) {
$("#ui-slider-handle").css('left', $("#ui-slider-bar").width() - 2); $("#ui-slider-handle").css('left', $("#ui-slider-bar").width() - 2);
}); });
/*
//build up the socket io connection
socket = io.connect(url, {resource: resource});
//send the ready message once we're connected
socket.on('connect', function()
{
sendSocketMsg("CLIENT_READY", {});
});
socket.on('disconnect', function()
{
BroadcastSlider.showReconnectUI();
});
//route the incoming messages
socket.on('message', function(message)
{
//if(window.console) console.log(message);
if(message.type == "CLIENT_VARS")
{
handleClientVars(message);
}
else if(message.accessStatus)
{
$("body").html("<h2>You have no permission to access this pad</h2>");
} else {
changesetLoader.handleMessageFromServer(message);
}
});
*/
//get all the export links //get all the export links
export_links = $('#export > .exportlink'); export_links = $('#export > .exportlink');
@ -300,25 +268,6 @@ function init(baseURL) {
}); });
} }
//sends a message over the socket
function sendSocketMsg(type, data)
{
var sessionID = decodeURIComponent(readCookie("sessionID"));
var password = readCookie("password");
var msg = { "component" : "pad", // FIXME: Remove this stupidity!
"type": type,
"data": data,
"padId": padId,
"token": token,
"sessionID": sessionID,
"password": password,
"protocolVersion": 2};
socket.json.send(msg);
}
var fireWhenAllScriptsAreLoaded = []; var fireWhenAllScriptsAreLoaded = [];
exports.init = init; exports.init = init;