fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1464 from mluto/old-chat-code 

Removed some old chat-code
This commit is contained in:
John McLear 2013-02-07 04:12:46 -08:00
parent e78879c300 6e8dcee650
commit 889cec8f7c
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);