diff --git a/static/img/jun09/pad/overlay.png b/static/img/jun09/pad/overlay.png deleted file mode 100644 index 89b6daac..00000000 --- a/static/img/jun09/pad/overlay.png +++ /dev/null @@ -1,1077 +0,0 @@ - - - - - - - - - - - - - overlay.png - - etherpad - - - Project Hosting on Google Code - - - - - - - - - - - - - - - - - - - -
-
- - - - My favorites ▼ - | Sign in - - - -
-
-
- - -
- - - - - - - - - - - - -
- -
- etherpad -
- - - 		- -
- - -
- -
- -
- - -
- Project Home - - - - - - - Wiki - - - - - - - - Source - - - -
-
- - - - - - - - - - - - - - -
-
-
- -
- - Repository: - -
- - - - Checkout   - Browse   - Changes   - Clones   -
- -   - - - -
-
-
- -
- - - -
- - - - - - - -
-
- - - - - - - - - - - -
- - -

- - This file is not plain text (only UTF-8 and Latin-1 - text encodings are currently supported). - -

- - -
- -
- -
-
-
-
-
-
-

Change log

-
- 81287c8af1 - by Aaron Iba <aaroniba> - on Dec 17, 2009 -   Diff -
- 
removed duplicate trunk directory
-
- - - - - - - - - - -
-
Go to:  - -
- - - - - - -
- Project members, - sign in to write a code review
- - - -
- - -
-
-
-
-
-
-
-
-
-
-
-

Older revisions

- - -
- - - a9f8774a2e - by Aaron Iba <aaroniba> - on Dec 17, 2009 -   Diff -
- 
initial code push
-
- - - All revisions of this file -
-
-
-
-
-
-
-
-
-
-
-
-

File info

- -
Size: 141 bytes
- - -
- -
-
-
-
-
-
-
- - -
- -
-
- - - - - - - - - - - - - - -
- -
- Powered by Google Project Hosting -
- - - - - - - - diff --git a/static/js/ace2_inner.js b/static/js/ace2_inner.js index 9e868e26..8f26a99c 100644 --- a/static/js/ace2_inner.js +++ b/static/js/ace2_inner.js @@ -1312,7 +1312,7 @@ function OUTER(gscope) { 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); diff --git a/static/js/pad2.js b/static/js/pad2.js index 7e472983..9adb1b43 100644 --- a/static/js/pad2.js +++ b/static/js/pad2.js @@ -186,7 +186,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(); @@ -214,12 +214,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({ @@ -289,15 +289,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') { @@ -308,7 +308,7 @@ var pad = { } } else if (msg.type == 'chat') { - padchat.receiveChat(msg); + //padchat.receiveChat(msg); } else if (msg.type == 'padtitle') { paddocbar.changeTitle(msg.title); @@ -509,8 +509,7 @@ 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' + '/static/img/jun09/pad/docbarstates.png' ]; function loadNextImage() { if (images.length == 0) {