mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-14 11:06:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 59

Merge 730266256c into 344e8be328

Browse source
This commit is contained in:
John McLear 2013-01-10 07:15:03 -08:00
commit e0ba68c0fb
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/static/css/timeslider.css
View file

@ -32,6 +32,12 @@
background-image: url(../../static/img/timeslider_background.png);
height: 63px;
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 {
height: 61px;
@ -140,6 +146,14 @@
#padmain {
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 {
float: right
}

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

@ -271,7 +271,8 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
Changeset.mutateTextLines(changeset, padContents);
padContents.currentRevision = revision;
padContents.currentTime += timeDelta;
padContents.currentTime += timeDelta * 1000;
debugLog('Time Delta: ', timeDelta)
updateTimer();
@ -293,8 +294,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
return str;
}
var date = new Date(padContents.currentTime);
var dateFormat = function()
{
@ -319,7 +318,6 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
$('#timer').html(dateFormat());
var revisionDate = html10n.get("timeslider.saved", {
"day": date.getDate(),
"month": [