NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge pull request #1346 from ether/fix-timeslider-date-not-changing

Browse source 
fix #1345: timeslider time delta
This commit is contained in:
Marcel Klehr 2013-01-10 04:50:12 -08:00
commit 7a62661705
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/static/js/broadcast.js
View file

@ -244,14 +244,14 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
if (broadcasting) applyChangeset(changesetForward, revision + 1, false, timeDelta); if (broadcasting) applyChangeset(changesetForward, revision + 1, false, timeDelta);
} }
/* /*
At this point, we must be certain that the changeset really does map from At this point, we must be certain that the changeset really does map from
the current revision to the specified revision. Any mistakes here will the current revision to the specified revision. Any mistakes here will
cause the whole slider to get out of sync. cause the whole slider to get out of sync.
*/ */
function applyChangeset(changeset, revision, preventSliderMovement, timeDelta) function applyChangeset(changeset, revision, preventSliderMovement, timeDelta)
{ {
// disable the next 'gotorevision' call handled by a timeslider update // disable the next 'gotorevision' call handled by a timeslider update
if (!preventSliderMovement) if (!preventSliderMovement)
{ {
@ -271,7 +271,8 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
Changeset.mutateTextLines(changeset, padContents); Changeset.mutateTextLines(changeset, padContents);
padContents.currentRevision = revision; padContents.currentRevision = revision;
padContents.currentTime += timeDelta; padContents.currentTime += timeDelta * 1000;
debugLog('Time Delta: ', timeDelta) debugLog('Time Delta: ', timeDelta)
updateTimer(); updateTimer();
@ -293,8 +294,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
return str; return str;
} }
var date = new Date(padContents.currentTime); var date = new Date(padContents.currentTime);
var dateFormat = function() var dateFormat = function()
{ {
@ -319,7 +318,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
$('#timer').html(dateFormat()); $('#timer').html(dateFormat());
var revisionDate = html10n.get("timeslider.saved", { var revisionDate = html10n.get("timeslider.saved", {
"day": date.getDate(), "day": date.getDate(),
"month": [ "month": [