mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Timeslider is working

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-06-20 15:37:41 +01:00
parent 44aa476ec0
commit 867525945d
7 changed files with 84 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

44
static/js/broadcast.js
View file

@ -103,7 +103,7 @@ function loadBroadcastJS()
var userId = "hiddenUser" + randomString();
var socketId;
var socket;
//var socket;
var channelState = "DISCONNECTED";
@ -406,12 +406,13 @@ function loadBroadcastJS()
}));
}
var changesetLoader = {
global.changesetLoader = {
running: false,
resolved: [],
requestQueue1: [],
requestQueue2: [],
requestQueue3: [],
reqCallbacks: [],
queueUp: function (revision, width, callback)
{
if (revision < 0) revision = 0;
@ -448,7 +449,26 @@ function loadBroadcastJS()
var granularity = request.res;
var callback = request.callback;
var start = request.rev;
debugLog("loadinging revision", start, "through ajax");
var requestID = Math.floor(Math.random()*100000);
/*var msg = { "component" : "timeslider",
"type":"CHANGESET_REQ",
"padId": padId,
"token": token,
"protocolVersion": 2,
"data"
{
"start": start,
"granularity": granularity
}};
socket.send(msg);*/
sendSocketMsg("CHANGESET_REQ",{ "start": start, "granularity": granularity, "requestID": requestID});
self.reqCallbacks[requestID] = callback;
/*debugLog("loadinging revision", start, "through ajax");
$.getJSON("/ep/pad/changes/" + clientVars.padIdForUrl + "?s=" + start + "&g=" + granularity, function (data, textStatus)
{
if (textStatus !== "success")
@ -459,7 +479,19 @@ function loadBroadcastJS()
self.handleResponse(data, start, granularity, callback);
setTimeout(self.loadFromQueue, 10); // load the next ajax function
});
});*/
},
handleSocketResponse: function (message)
{
var self = changesetLoader;
var start = message.data.start;
var granularity = message.data.granularity;
var callback = self.reqCallbacks[message.data.requestID];
delete self.reqCallbacks[message.data.requestID];
self.handleResponse(message.data, start, granularity, callback);
setTimeout(self.loadFromQueue, 10);
},
handleResponse: function (data, start, granularity, callback)
{
@ -561,7 +593,7 @@ function loadBroadcastJS()
}));
}
function setUpSocket()
/*function setUpSocket()
{
// required for Comet
if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
@ -607,7 +639,7 @@ function loadBroadcastJS()
{
abandonConnection("initsocketfail");
}
}
}*/
function setChannelState(newChannelState, moreInfo)
{