mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-14 11:06:55 -04:00
Merge 730266256c
into 344e8be328
This commit is contained in:
commit
e0ba68c0fb
2 changed files with 18 additions and 6 deletions
|
@ -32,6 +32,12 @@
|
||||||
background-image: url(../../static/img/timeslider_background.png);
|
background-image: url(../../static/img/timeslider_background.png);
|
||||||
height: 63px;
|
height: 63px;
|
||||||
margin: 0 9px;
|
margin: 0 9px;
|
||||||
|
-webkit-touch-callout: none;
|
||||||
|
-webkit-user-select: none;
|
||||||
|
-khtml-user-select: none;
|
||||||
|
-moz-user-select: none;
|
||||||
|
-ms-user-select: none;
|
||||||
|
user-select: none;
|
||||||
}
|
}
|
||||||
#timeslider #timeslider-slider {
|
#timeslider #timeslider-slider {
|
||||||
height: 61px;
|
height: 61px;
|
||||||
|
@ -140,6 +146,14 @@
|
||||||
#padmain {
|
#padmain {
|
||||||
top: 0px !important
|
top: 0px !important
|
||||||
}
|
}
|
||||||
|
#editbar{
|
||||||
|
-webkit-touch-callout: none;
|
||||||
|
-webkit-user-select: none;
|
||||||
|
-khtml-user-select: none;
|
||||||
|
-moz-user-select: none;
|
||||||
|
-ms-user-select: none;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
#editbarright {
|
#editbarright {
|
||||||
float: right
|
float: right
|
||||||
}
|
}
|
||||||
|
|
|
@ -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": [
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue