Merge 730266256c into 344e8be328

src/static/css/timeslider.css

@@ -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
 }

src/static/js/broadcast.js

@@ -244,14 +244,14 @@ function loadBroadcastJS(socket, sendSocketMsg, fireWhenAllScriptsAreLoaded, Bro
     if (broadcasting) applyChangeset(changesetForward, revision + 1, false, timeDelta);
   }
 
-/*
+   /*
    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
    cause the whole slider to get out of sync.
    */
 
   function applyChangeset(changeset, revision, preventSliderMovement, timeDelta)
-  {
+  { 
     // disable the next 'gotorevision' call handled by a timeslider update
     if (!preventSliderMovement)
     {
@@ -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": [