libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
John McLear 2013-02-07 15:27:43 +00:00
commit 52afe86377
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/static/js/broadcast_slider.js
View file

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

12
src/static/js/pad.js
View file

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