Merge branch 'develop' of github.com:ether/etherpad-lite into fix-timeslider-tests

src/static/js/broadcast_slider.js

@@ -107,16 +107,16 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
     {
       newpos = Number(newpos);
       if (newpos < 0 || newpos > sliderLength) return;
-      window.location.hash = "#" + newpos;
       if(!newpos){
         newpos = 0; // stops it from displaying NaN if newpos isn't set
       }
+      window.location.hash = "#" + newpos;
       $("#ui-slider-handle").css('left', newpos * ($("#ui-slider-bar").width() - 2) / (sliderLength * 1.0));
       $("a.tlink").map(function()
       {
         $(this).attr('href', $(this).attr('thref').replace("%revision%", newpos));
       });
-      console.log(newpos);
+
       $("#revision_label").html(html10n.get("timeslider.version", { "version": newpos}));
 
       if (newpos == 0)

src/static/js/pad.js

@@ -501,7 +501,6 @@ var pad = {
     padeditor.init(postAceInit, pad.padOptions.view || {}, this);
 
     paduserlist.init(pad.myUserInfo, this);
-    //    padchat.init(clientVars.chatHistory, pad.myUserInfo);
     padconnectionstatus.init();
     padmodals.init(this);
 
@@ -540,7 +539,7 @@ var pad = {
         $('#options-stickychat').prop("checked", true); // set the checkbox to on
       }
       if(padcookie.getPref("showAuthorshipColors") == false){
-	pad.changeViewOption('showAuthorColors', false);
+        pad.changeViewOption('showAuthorColors', false);
       }
       hooks.aCallAll("postAceInit", {ace: padeditor.ace});
     }
@@ -553,13 +552,11 @@ var pad = {
   {
     pad.myUserInfo.name = newName;
     pad.collabClient.updateUserInfo(pad.myUserInfo);
-    //padchat.handleUserJoinOrUpdate(pad.myUserInfo);
   },
   notifyChangeColor: function(newColorId)
   {
     pad.myUserInfo.colorId = newColorId;
     pad.collabClient.updateUserInfo(pad.myUserInfo);
-    //padchat.handleUserJoinOrUpdate(pad.myUserInfo);
   },
   notifyChangeTitle: function(newTitle)
   {
@@ -643,17 +640,14 @@ var pad = {
   handleUserJoin: function(userInfo)
   {
     paduserlist.userJoinOrUpdate(userInfo);
-    //padchat.handleUserJoinOrUpdate(userInfo);
   },
   handleUserUpdate: function(userInfo)
   {
     paduserlist.userJoinOrUpdate(userInfo);
-    //padchat.handleUserJoinOrUpdate(userInfo);
   },
   handleUserLeave: function(userInfo)
   {
     paduserlist.userLeave(userInfo);
-    //padchat.handleUserLeave(userInfo);
   },
   handleClientMessage: function(msg)
   {
@@ -665,10 +659,6 @@ var pad = {
         paduserlist.setMyUserInfo(pad.myUserInfo);
       }
     }
-    else if (msg.type == 'chat')
-    {
-      //padchat.receiveChat(msg);
-    }
     else if (msg.type == 'padtitle')
     {
       paddocbar.changeTitle(msg.title);