From 867525945d2439ae0cd0ed4907da62f9c6d00419 Mon Sep 17 00:00:00 2001
From: Peter 'Pita' Martischka <petermartischka@googlemail.com>
Date: Mon, 20 Jun 2011 15:37:41 +0100
Subject: [PATCH] Timeslider is working

---
 node/TimesliderMessageHandler.js        |  22 ++++++
 package.json                            |   2 +-
 static/img/crushed_button_depressed.png | Bin 0 -> 4134 bytes
 static/img/pause.png                    | Bin 0 -> 2883 bytes
 static/js/broadcast.js                  |  44 +++++++++--
 static/js/broadcast_slider.js           |   6 +-
 static/timeslider.html                  |  98 +++++-------------------
 7 files changed, 84 insertions(+), 88 deletions(-)
 create mode 100644 static/img/crushed_button_depressed.png
 create mode 100644 static/img/pause.png

diff --git a/node/TimesliderMessageHandler.js b/node/TimesliderMessageHandler.js
index 8e589443c..2212c110f 100644
--- a/node/TimesliderMessageHandler.js
+++ b/node/TimesliderMessageHandler.js
@@ -68,6 +68,10 @@ exports.handleMessage = function(client, message)
   {
     handleClientReady(client, message);
   }
+  else if(message.type == "CHANGESET_REQ")
+  {
+    handleChangesetRequest(client, message);
+  }
   //if the message type is unkown, throw an exception
   else
   {
@@ -85,6 +89,24 @@ function handleClientReady(client, message)
   })
 }
 
+function handleChangesetRequest(client, message)
+{
+  var granularity = message.data.granularity;
+  var start = message.data.start;
+  var end = start + (100 * granularity);
+  var padId = message.padId;
+  
+  getChangesetInfo(padId, start, end, granularity, function(err, changesetInfo)
+  {
+    if(err) throw err;
+    
+    var data = changesetInfo;
+    data.requestID = message.data.requestID;
+    
+    client.send({type: "CHANGESET_REQ", data: data});
+  });
+}
+
 function createTimesliderClientVars (padId, callback)
 {
   var clientVars = {
diff --git a/package.json b/package.json
index 9663efe2b..3bf789ece 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
                   ],
   "dependencies"  : {
                       "socket.io"  : "0.6.18",
-                      "ueberDB"    : "0.0.7",
+                      "ueberDB"    : "0.0.8",
                       "async"      : "0.1.9",
                       "joose"      : "3.18.0",
                       "express"    : "2.3.10",
diff --git a/static/img/crushed_button_depressed.png b/static/img/crushed_button_depressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..d75dcce289051293d69a9be79874492ef7959be1
GIT binary patch
literal 4134
zcmV+>5ZUjEP)<h;3K|Lk000e1NJLTq001ul001ut1^@s6b0?Fm000U(X+uL$P-t&-
zZ*ypGa3D!TLm+T+Z)Rz1WdHzZ-kp|rR8-d%htIutdZEoQ0#b(FyTAa_dy`&8VVD_U
zC<6{NG_fI~0ue<-nj%P0#DLLIBvwSR5EN9f2P6n6F&ITuEN@2Ei>|D^_ww@l<E(G(
zv-i3C?7h!g7XXr{FPE1FO97C|6YzsPoaqsfQFQD8fB_z0fGGe>Rz|vCuzLs)$;-`!
zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT<Vw7l=3|OOP(M&x)8Dmn>!&
zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^#
zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub
z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z
z{i;y^b@OjZ+}lNZ8Th$p5Uu}<?XUdO8USF-iE6X+i!H7SfX*!d$ld#5(>MTtq^NHl
z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoD<bXCyxEkMhu6Iq^(kihwSz8!Ig(
zO~|Kbq%&C@y5XOP_#X%Ubsh#moOlkO!xKe>iKdLpOAxi2$L0#SX*@cY_n(^h55xYX
z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr
zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0f<U<Ry!EpP;Gz#I635D*Dg0~SaGseli%
zKpxlx3PCa03HE?$PzM@8GiU|JK_@r`&Vx(f8n^*&gZp3<On_%#7Q6-v5CmZ%GDLyo
zAr(jy(ud3-24oMpLB3EB6bZ#b2@nqwLV3_;s2D1Ps-b$Q8TuYN37v<oK!ea-XbhT$
zeuv({2uy;huoA2V8^a9P3HE_Q;8kz}yavvN3*a4aCENfXg*)K$@HO~0JPJR9=MaDp
z5gMY37$OYB1@T9ska&cTtVfEF3ZwyPMY@qb<R&tT%ph-37!(CXM;W4QQJ$z!6brQm
zwH{T1szx0~b)b4tH&J7#S=2`~8Lf!cN86yi&=KeabQZc0U4d>wx1%qjZ=)yBuQ3=5
z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb
zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v
z2qA<d!X`o`p_Oov@PP1=NF=Het%-p|E^#BVl6Z`GnK(v#OOhe!kz7d8Bq3=B=@980
z=`QIdnM~FqJCdWw0`d-WGx-Af5&4Y-MZ!qJOM)%2L83;YLt;qcxg=gvQ_@LtwPdbj
zh2#mz>yk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U?
zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O
zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYW<H!}swaML<dnZqqcau++-zDEE
z|4;#?pr;V1kfpF+;iAIKQtDFMrL3hzOOG$TrwA+RDF!L7RXnKJuQ;cqtmL7Tu2iLT
zL1{*rrtGMkq+G6iMtNF=qGGSYRVi0FtMZgCOLwBD&@1V^^jTF!RZmr+YQ5@!>VlfK
zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu76<DMp7lcAZYxmUAKb6!hZD_m=<R;SjK
zww$(?cCL1d_5&TVj)Tq`od%s-x)@!CZnEw^-5Ywao`qhbUX9*$eOTX8pR2!5f6xGJ
zU~RxNXfPNtBpEsxW*W8_jv3L6e2wyrI*pziYZylv?=tQ){%B%hl48<ma^F<O)Y~-Q
zwA=J|Gd(kwS&i8(bF#U+`3CbY^B2qXmvNTuUv|fWV&P}8)uPAZgQb-v-?G(m+DgMJ
z)~eQOgh6ElFiIGgt<l!b)*Gx(S--Whv=P`GxB1Q1&^Foji0#yJ?d6>1jmyXF)a;mc
z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4
z9<D{M18y>Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0
z1p8F`JoeS|<@<K~!G7L;yZs)l&|JY=(diHTz5I9kKMc?gSQGGLASN&%uqN<HkZDj}
zP+u@5I41Z=@aqugkkXL*p*o?$(4H{Ku;{Snu=#M;@UrmH2;+!#5!WIWBDs-WQP`-k
zsHUj7m2NBdtel9ph%SsCUZuS%d)1ZI3ae9ApN^4?VaA+@MaPE69*KR=^k+6O=i<EL
zYU5^EF08$*XKY7yIeVI8$0_4X#@of0#ZM*JCG1X^PIO4DNSxuiaI3j5l01{@lID~B
zlMf|-N(oPCOU0$erk>=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_
zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw
zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL
z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9
z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J<Fdxd*PD}5`wsx+#0R=uxItiE02T+>#o
zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~
z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0
z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua;
zOu?B?XLHZaol8GAb3Wnxcu!2v{R<HnZuJKC4qWuPc=?k1r3-ydeP=J*T|RZi=E}*d
zjH{j3EU$I+TlBa8Wbsq`faO5Pb*t-LH>_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n
z@STz9k<mNsJ5zU4?!LH}d2iwV#s}yJMGvJORy<OC)bO+J&uycYqo>DQ$NC=!KfXWC
z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR
zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_
z^YOu_)K8!O1p}D#{Jgc%9RL6TAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*
zm;eA5Z<1fdMgRZ+32;bRa{vGf6951U69E94oEQKA1!qY_K~!ko&6>$-V@DK*weZ7a
z5qjOb?3&&L{04#GT~>zP_M)MmA|xTu0b}rNc_OhL%kw<TmTfFg@;uL0lfF4$aqChl
zl}1~V7e5zWRh{}y4W~|(6!JVTREX;8>RhT3)r*!z=c1(Oo5=H@N&o$_U#=#Dot!dR
zLWRO_Z*MD!p=wcw=qwx#d;R_W-o(U&x3I9_#bPmUb92*^a_Y%v-t#@>C{I1Ve)aC|
zZfI|BPbrZ|g!cFMLk9;3p~J(&(9zM6((&=J(zD>Du^&Z)t*xzIBoa|jJ3BiCi+a?@
z4)(AMxC>r`pPZZ&4=)XTp|RoNVbz<(K%0^t_tw_dypfR+?Zg+;ffwm{G5TJ#$dE^)
z(VRd?ra(@aWmi^K)Rdwf+RN1Y1;LA<+NP!^Z)|KVE3gKVUMpB;UDic&b2CoVx*W(G
zUJQI}YisjnW@fTNYY1sfNgB*5T`rR|b8~ZEdwV+$d@Kqc&oMARKOYRQIm{Xs7%}dN
zaV2RWr*v8BA=@dmxVWets4WPdImgh=&dxf)ZD@cb5(GLuJ$1?~<8s6vAtI7Lh2G~4
z-_X#oHa<R{25$DY4V?)%Uq|fG(3+Z>^5Dq}o^Zvg&jjx3?Lxuxal&+DU|>Ln(X8-n
z6vSJ?mKoCQ-qsDDot?dyY-h|hvazw@5jfz>2rnUVnhnDQr^ibTZaZL)2qJ{S=Y%K6
zz`OPJ^%QVDRrE9|6?iTu$dml&Q=JCi($X?GG&GbFvvow#J&xh?^YgOFc4~BV)Ppk(
zUWVjud3ia2*WpU{c)7t{jxa0WOo1oA?&#=9>viV2IaMkNuhrGn#nh<@;AJlTLpXA6
zK7do{;^Lz0y1cwh69EO@0A3bqVtRTy4c?qCuLYj80p0*!w%`Y1yWSLB;4VX@*45Qj
znmC!k8^Fu<`(HdB58%y3S}AZF{`&e_2|joO`1<;KwNUN3UP*WtIASKiYet)_;I82-
zwKVL_%}tu%)$mn#!eX^|(botMli%}Is^=RU8^3LBZKc4Q3-vX?-`?IT!3eJzDwCYz
z&CSRJH|JcrWCEkRyE`Rv9C!oxo}Qiy&W*1XUV|f27<dDC*<GU~WtqTTi>8#aq3`eS
z196K1ZvZd5>!0KdI)8W#@GfxF-QDfMYi5;i!{P8(vNm&Tt^~Z<>oz#^9Zq;tQsPJ?
zvdf{{j4rN)Q)-#e4-XG1;xG<pT0S3*Mt|k@mUwT6s&ayBcpID$PTCHq>kRv5aB%RF
z?9!etl>~o$d{pA{3qClV2k=-d_6NPsRY#^!RSMbDL<4J)ro#nawtJiJrRNX1!hQ|l
zPft%ugh#mG%XMS+Q(s@-Emv(eyuJEg0@?+xp%I%BJaEZ(xv%>q;s1-vCoX$jjo7lC
z$|k$63s{ST2ORLo=Mc*0miRk~`5T>`oytHq@M7ee8d}L@Qi+((#t8>JfalfozJ6F;
zU5(=aBk)qN*?L-o(_w(qJ{%gn5P0+s&l$R<rKP-}aw!`$;%6h;^LzZAo-W0}s}Yb>
z);x=b8!N(AHjr#GA#HJrBdX92?a{8h4?P!NtpU*|!WHqB4TJRgxxk1-kjTdF>4(El
zwC4gZ7Cs20l0Gc5)A^054XqexE^?`l9qeHj`#@&`m#O-^ACdiy;zJ^lSdwAp*YB@#
zIPgg7WPvFtvQi=xkUaU!?F8R*RZV&7Q6D?l!>$SK0)IBV@gD$kj9)~*#pChV<mBXW
zZ*T7%P@FM2By-B=$!Fg4J>@7*J-_~&vi<iUgF*7^pGBWVzl)khe~bS0pUwXJ&wjbL
k75U>tfelp^3z-l6|4d{IfDIkImjD0&07*qoM6N<$f+oxE@&Et;

literal 0
HcmV?d00001

diff --git a/static/img/pause.png b/static/img/pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..657782c0fac9f6e6058803bd276a36b73b83d1de
GIT binary patch
literal 2883
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

literal 0
HcmV?d00001

diff --git a/static/js/broadcast.js b/static/js/broadcast.js
index c150ebb66..9b25e3b8b 100644
--- a/static/js/broadcast.js
+++ b/static/js/broadcast.js
@@ -103,7 +103,7 @@ function loadBroadcastJS()
 
   var userId = "hiddenUser" + randomString();
   var socketId;
-  var socket;
+  //var socket;
 
   var channelState = "DISCONNECTED";
 
@@ -406,12 +406,13 @@ function loadBroadcastJS()
     }));
   }
 
-  var changesetLoader = {
+  global.changesetLoader = {
     running: false,
     resolved: [],
     requestQueue1: [],
     requestQueue2: [],
     requestQueue3: [],
+    reqCallbacks: [],
     queueUp: function (revision, width, callback)
     {
       if (revision < 0) revision = 0;
@@ -448,7 +449,26 @@ function loadBroadcastJS()
       var granularity = request.res;
       var callback = request.callback;
       var start = request.rev;
-      debugLog("loadinging revision", start, "through ajax");
+      var requestID = Math.floor(Math.random()*100000);
+      
+      /*var msg = { "component" : "timeslider",
+                  "type":"CHANGESET_REQ", 
+                  "padId": padId,
+                  "token": token,
+                  "protocolVersion": 2, 
+                  "data"
+                  {
+                    "start": start,
+                    "granularity": granularity
+                  }};
+    
+      socket.send(msg);*/
+      
+      sendSocketMsg("CHANGESET_REQ",{ "start": start, "granularity": granularity, "requestID": requestID});
+      
+      self.reqCallbacks[requestID] = callback;
+      
+      /*debugLog("loadinging revision", start, "through ajax");
       $.getJSON("/ep/pad/changes/" + clientVars.padIdForUrl + "?s=" + start + "&g=" + granularity, function (data, textStatus)
       {
         if (textStatus !== "success")
@@ -459,7 +479,19 @@ function loadBroadcastJS()
         self.handleResponse(data, start, granularity, callback);
 
         setTimeout(self.loadFromQueue, 10); // load the next ajax function
-      });
+      });*/
+    },
+    handleSocketResponse: function (message)
+    {
+       var self = changesetLoader;
+       
+       var start = message.data.start;
+       var granularity = message.data.granularity;
+       var callback = self.reqCallbacks[message.data.requestID];
+       delete self.reqCallbacks[message.data.requestID];
+       
+       self.handleResponse(message.data, start, granularity, callback);
+       setTimeout(self.loadFromQueue, 10);
     },
     handleResponse: function (data, start, granularity, callback)
     {
@@ -561,7 +593,7 @@ function loadBroadcastJS()
     }));
   }
 
-  function setUpSocket()
+  /*function setUpSocket()
   {
     // required for Comet
     if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
@@ -607,7 +639,7 @@ function loadBroadcastJS()
     {
       abandonConnection("initsocketfail");
     }
-  }
+  }*/
 
   function setChannelState(newChannelState, moreInfo)
   {
diff --git a/static/js/broadcast_slider.js b/static/js/broadcast_slider.js
index 209667703..3a645c9d6 100644
--- a/static/js/broadcast_slider.js
+++ b/static/js/broadcast_slider.js
@@ -346,16 +346,16 @@ function loadBroadcastSliderJS()
       {
         var self = this;
 
-        $(self).css('background-image', 'url(/static/img/pad/timeslider/crushed_button_depressed.png)');
+        $(self).css('background-image', 'url(/static/img/crushed_button_depressed.png)');
         $(self).mouseup(function (evt2)
         {
-          $(self).css('background-image', 'url(/static/img/pad/timeslider/crushed_button_undepressed.png)');
+          $(self).css('background-image', 'url(/static/img/crushed_button_undepressed.png)');
           $(self).unbind('mouseup');
           BroadcastSlider.playpause();
         });
         $(document).mouseup(function (evt2)
         {
-          $(self).css('background-image', 'url(/static/img/pad/timeslider/crushed_button_undepressed.png)');
+          $(self).css('background-image', 'url(/static/img/crushed_button_undepressed.png)');
           $(document).unbind('mouseup');
         });
       });
diff --git a/static/timeslider.html b/static/timeslider.html
index 88cdb84fb..791bd4961 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -51,11 +51,10 @@
 	  return "t." + randomstring;
   }
 
-  /*var padId, token;
+  var socket, token, padId;
 
-  $(document).ready(function() 
+  $(window).load(function () 
   {
-    //find out the padId
     var urlParts= document.URL.split("/");
     padId = urlParts[urlParts.length-2];
         
@@ -74,53 +73,9 @@
     socket = new io.Socket();
     socket.connect();
     
-    socket.on('connect', function(){
-      var msg = { "component" : "timeslider",
-                  "type":"CLIENT_READY", 
-                  "padId": padId,
-                  "token": token,
-                  "protocolVersion": 2};
-    
-      socket.send(msg);
-    });
-    
-    socket.on('message', function(message)
-    {
-      console.log(message);
-      clientVars = message.data;
-      initalizeWithClientVars();
-    })
-  });*/
-
-  $(window).load(function () 
-  {
-    var urlParts= document.URL.split("/");
-    var padId = urlParts[urlParts.length-2];
-        
-    //set the title
-    document.title = document.title + " | " + padId;
-        
-    //ensure we have a token
-    var token = readCookie("token");
-    if(token == null)
-    {
-      token = randomString();
-      createCookie("token", token, 60);
-    }
-    
-    //build up the socket io connection
-    var socket = new io.Socket();
-    socket.connect();
-    
     socket.on('connect', function()
     {
-      var msg = { "component" : "timeslider",
-                  "type":"CLIENT_READY", 
-                  "padId": padId,
-                  "token": token,
-                  "protocolVersion": 2};
-    
-      socket.send(msg);
+      sendSocketMsg("CLIENT_READY", {});
     });
     
     socket.on('message', function(message)
@@ -131,11 +86,26 @@
       {
         handleClientVars(message);
       }
+      else if(message.type == "CHANGESET_REQ")
+      {
+        changesetLoader.handleSocketResponse(message);
+        //alert("answer!")
+      }
     });
-    
-    //handleClientVars({data: clientVars});
   });
   
+  function sendSocketMsg(type, data)
+  {
+    var msg = { "component" : "timeslider",
+                "type": type,
+                "data": data, 
+                "padId": padId,
+                "token": token,
+                "protocolVersion": 2};
+    
+    socket.send(msg);
+  }
+  
   var fireWhenAllScriptsAreLoaded = [];
   
   function handleClientVars(message)
@@ -151,34 +121,6 @@
     {
       fireWhenAllScriptsAreLoaded[i]();
     }
-    
-    /*var scriptsToLoad = 3;
-    
-    var loadCallback = function(info)
-    {
-      scriptsToLoad--;
-      
-      console.log(scriptsToLoad);
-      
-      if(scriptsToLoad == 1)
-      {
-        $.getScript('/static/js/broadcast.js', loadCallback);
-      }
-      
-      //if all scripts are loaded
-      if(scriptsToLoad == 0)
-      {
-        console.log("execute!");
-      
-        for(var i=0;i < fireWhenAllScriptsAreLoaded.length;i++)
-        {
-          fireWhenAllScriptsAreLoaded[i]();
-        }
-      }
-    }*/
-    
-    //$.getScript('/static/js/broadcast_slider.js', loadCallback);
-    //$.getScript('/static/js/broadcast_revisions.js', loadCallback);
   }
 
   // ]]>