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

Remove overlay.png as it included HTML

This commit is contained in:
John McLear 2011-03-27 10:06:16 +00:00
parent 750c75e1dc
commit 78d8e18634
3 changed files with 9 additions and 1087 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1077
static/img/jun09/pad/overlay.png
View File

File diff suppressed because it is too large Load Diff

2
static/js/ace2_inner.js
View File

@ -1312,7 +1312,7 @@ function OUTER(gscope) {
isTimeUp = (isTimeUp || function() { return false; }); isTimeUp = (isTimeUp || function() { return false; });
if (DEBUG && window.DONT_INCORP || window.DEBUG_DONT_INCORP) return false; if (DEBUG && top.DONT_INCORP || top.DEBUG_DONT_INCORP) return false;
var p = PROFILER("incorp", false); var p = PROFILER("incorp", false);

17
static/js/pad2.js
View File

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