Timeslider++

src/node/db/Pad.js

@@ -54,6 +54,10 @@ Pad.prototype.getHeadRevisionNumber = function getHeadRevisionNumber() {
   return this.head;
 };
 
+Pad.prototype.getHeadChangesetNumber = function getHeadChangesetNumber() {
+  return this.head+1;
+};
+
 Pad.prototype.getPublicStatus = function getPublicStatus() {
   return this.publicStatus;
 };

src/node/handler/PadMessageHandler.js

@@ -1116,6 +1116,7 @@ function handleClientReady(client, message)
               "historicalAuthorData": historicalAuthorData,
               "apool": apool,
               "rev": pad.getHeadRevisionNumber(),
+              "lastCs": pad.getHeadChangesetNumber(),
               "time": currentTime,
           },
           "colorPalette": authorManager.getColorPalette(),
@@ -1306,7 +1307,6 @@ function handleChangesetRequest(client, message)
 
         var data = changesetInfo;
         data.requestID = message.data.requestID;
-
         client.json.send({type: "CHANGESET_REQ", data: data});
       });
     }
@@ -1338,16 +1338,16 @@ function getChangesetInfo(padId, startNum, endNum, granularity, callback)
       {
         if(ERR(err, callback)) return;
         pad = _pad;
-        head_revision = pad.getHeadRevisionNumber();
+        head_revision = pad.getHeadChangesetNumber();
         callback();
       });
     },
     function(callback)
     {
       //calculate the last full endnum
-      var lastRev = pad.getHeadRevisionNumber();
-      if (endNum > lastRev+1) {
-        endNum = lastRev+1;
+      var lastRev = pad.getHeadChangesetNumber();
+      if (endNum > lastRev) {
+        endNum = lastRev;
       }
       endNum = Math.floor(endNum / granularity)*granularity;
 
@@ -1545,10 +1545,9 @@ function composePadChangesets(padId, startNum, endNum, callback)
     function(callback)
     {
       var changesetsNeeded=[];
-
-      var headNum = pad.getHeadRevisionNumber();
-      if (endNum > headNum+1)
-        endNum = headNum+1;
+      var headNum = pad.getHeadChangesetNumber();
+      if (endNum > headNum)
+        endNum = headNum;
       if (startNum < 0)
         startNum = 0;
       //create a array for all changesets, we will

src/static/css/timeslider.css

@@ -1,7 +1,115 @@
+/*
+ * slider handles (SliderHandle)
+ */
+
+.ui-slider-handle  {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+  cursor: pointer;
+  position: absolute;
+}
+
+.ui-slider-handle-star {
+  background-image: url(../../static/img/star.png);
+  height: 16px;
+  top: 20px;
+  width: 15px;
+}
+
+.ui-slider-handle-handle {
+  background-image: url(../../static/img/crushed_current_location.png);
+  height: 61px;
+  left: 0;
+  top: -14px;
+  width: 13px;
+}
+
+/*
+ * Steppers
+ */
+
+.stepper {
+  background: url(../../static/img/stepper_buttons.png) 0 0 no-repeat;
+  height: 21px;
+  overflow: hidden;
+  position: absolute;
+}
+#leftstar {
+  background-position: 0 -44px;
+  right: 34px;
+  top: 8px;
+  width: 30px;
+}
+#rightstar {
+  background-position: -29px -44px;
+  right: 5px;
+  top: 8px;
+  width: 30px;
+}
+#leftstep:active {
+  background-position: 0 -22px;
+  right: 34px;
+  top: 20px;
+  width: 30px;
+}
+#leftstep {
+  background-position: 0 -66px;
+  right: 34px;
+  top: 20px;
+  width: 30px;
+}
+#rightstep:active {
+  background-position: -29px -22px;
+  right: 5px;
+  top: 20px;
+  width: 30px;
+}
+#rightstep {
+  background-position: -29px -66px;
+  right: 5px;
+  top: 20px;
+  width: 30px;
+}
+
+#playpause_button,
+#playpause_button_icon {
+  height: 47px;
+  position: absolute;
+  width: 47px;
+}
+#playpause_button {
+  background-image: url(../../static/img/crushed_button_undepressed.png);
+  right: 77px;
+  top: 9px;
+}
+#playpause_button:active {
+  background-image: url(../../static/img/crushed_button_depressed.png);
+  right: 77px;
+  top: 9px;
+}
+#playpause_button_icon {
+  background-image: url(../../static/img/play.png);
+  left: 0;
+  top: 0;
+}
+.pause#playpause_button_icon {
+  background-image: url(../../static/img/pause.png)
+}
+
+
+
+
+
+
+
+#timeslider .slider-handle {
+  position: absolute;
+}
 #editorcontainerbox {
   overflow: auto;
-  top: 40px;
-  position: static;
+  top: 120px;
+  position: absolute;
 }
 #padcontent {
   font-size: 12px;
@@ -45,6 +153,7 @@
   top: 1px;
   width: 100%;
 }
+
 #ui-slider-handle {
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -57,6 +166,7 @@
   top: 0;
   width: 13px;
 }
+
 #ui-slider-bar {
   -webkit-user-select: none;
   -moz-user-select: none;
@@ -159,6 +269,7 @@ stepper:active{
   top: 40px;
   width: 15px;
 }
+>>>>>>> e51ab2db249fea3f7ac1e64ffca576fb163703f3
 #timeslider #timer {
   background: linear-gradient(#F7F7F7, #F1F1F1 80%) repeat scroll 0% 0% transparent;
   padding:2px;
@@ -170,6 +281,10 @@ stepper:active{
   text-align: center;
   top: 9px;
   width: 122px;
+  background-color: #A9A9A9;
+  border: 1px solid #a8a8a8;
+  border-radius: 3px;
+  text-shadow: 0 0 3px #a5a5a5;
 }
 .topbarcenter,
 #docbar {
@@ -217,6 +332,7 @@ stepper:active{
   overflow: hidden;
   padding-top: 3px;
   width: 100%;
+  border-bottom: thin solid #cccccc;
 }
 .timeslider-bar #editbar {
   border-bottom: none;
@@ -236,12 +352,16 @@ stepper:active{
   z-index: 1;
 }
 #authorsList .author {
-  padding-left: 0.4em;
-  padding-right: 0.4em;
+  padding: 0 0.4em;
+  margin: 0 0.4em;
+  opacity: 0.6
 }
 #authorsList .author-anonymous {
-  padding-left: 0.6em;
-  padding-right: 0.6em;
+  padding: 0 0.1em;
+}
+#authorsList .author.highlighted {
+  box-shadow: 0 0 10px #fff;
+  opacity: 1.0;
 }
 #padeditor {
   position: static