mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote branch 'johns/master'

Browse source
This commit is contained in:
HansPinckaers 2011-04-06 19:31:23 +02:00
commit 9eb1fecfa7
16 changed files with 1329 additions and 2561 deletions
Download patch file Download diff file Expand all files Collapse all files

16
static/js/pad2.js
View file

@ -208,7 +208,7 @@ var pad = {
padeditor.init(postAceInit, pad.padOptions.view || {});
paduserlist.init(pad.myUserInfo);
padchat.init(clientVars.chatHistory, pad.myUserInfo);
// padchat.init(clientVars.chatHistory, pad.myUserInfo);
padconnectionstatus.init();
padmodals.init();
@ -236,12 +236,12 @@ var pad = {
notifyChangeName: function(newName) {
pad.myUserInfo.name = newName;
pad.collabClient.updateUserInfo(pad.myUserInfo);
padchat.handleUserJoinOrUpdate(pad.myUserInfo);
//padchat.handleUserJoinOrUpdate(pad.myUserInfo);
},
notifyChangeColor: function(newColorId) {
pad.myUserInfo.colorId = newColorId;
pad.collabClient.updateUserInfo(pad.myUserInfo);
padchat.handleUserJoinOrUpdate(pad.myUserInfo);
//padchat.handleUserJoinOrUpdate(pad.myUserInfo);
},
notifyChangeTitle: function(newTitle) {
pad.collabClient.sendClientMessage({
@ -311,15 +311,15 @@ var pad = {
},
handleUserJoin: function(userInfo) {
paduserlist.userJoinOrUpdate(userInfo);
padchat.handleUserJoinOrUpdate(userInfo);
//padchat.handleUserJoinOrUpdate(userInfo);
},
handleUserUpdate: function(userInfo) {
paduserlist.userJoinOrUpdate(userInfo);
padchat.handleUserJoinOrUpdate(userInfo);
//padchat.handleUserJoinOrUpdate(userInfo);
},
handleUserLeave: function(userInfo) {
paduserlist.userLeave(userInfo);
padchat.handleUserLeave(userInfo);
//padchat.handleUserLeave(userInfo);
},
handleClientMessage: function(msg) {
if (msg.type == 'suggestUserName') {
@ -330,7 +330,7 @@ var pad = {
}
}
else if (msg.type == 'chat') {
padchat.receiveChat(msg);
//padchat.receiveChat(msg);
}
else if (msg.type == 'padtitle') {
paddocbar.changeTitle(msg.title);
@ -531,8 +531,6 @@ var pad = {
'/static/img/jun09/pad/sharebox4.gif',
'/static/img/jun09/pad/sharedistri.gif',
'/static/img/jun09/pad/colorpicker.gif',
'/static/img/jun09/pad/docbarstates.png',
'/static/img/jun09/pad/overlay.png'
];
function loadNextImage() {
if (images.length == 0) {