mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-11-04 10:11:33 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop

Browse Source
This commit is contained in:
johnyma22 2012-05-28 19:09:43 +01:00
commit 50b061cb6a
4 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/node/handler/ImportHandler.js
View File

@ -196,6 +196,6 @@ exports.doImport = function(req, res, padId)
ERR(err); ERR(err);
//close the connection //close the connection
res.send("<script>document.domain = document.domain; var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "'); </script>", 200); res.send("<script type='text/javascript' src='/static/js/jquery.js'></script><script> if ( (!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf(\"1.8.\") == 0)) ){document.domain = document.domain;}var impexp = window.top.require('/pad_impexp').padimpexp.handleFrameCall('" + status + "');</script>", 200);
}); });
} }

20
src/node/handler/PadMessageHandler.js
View File

@ -177,32 +177,26 @@ exports.handleMessage = function(client, message)
{ {
handleClientReady(client, message); handleClientReady(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.type == "COLLABROOM" && typeof message.data == 'object'){
message.data.type == "USER_CHANGES") if (message.data.type == "USER_CHANGES")
{ {
handleUserChanges(client, message); handleUserChanges(client, message);
} }
else if(message.type == "COLLABROOM" && else if (message.data.type == "USERINFO_UPDATE")
message.data.type == "USERINFO_UPDATE")
{ {
handleUserInfoUpdate(client, message); handleUserInfoUpdate(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.data.type == "CHAT_MESSAGE")
message.data.type == "CHAT_MESSAGE")
{ {
handleChatMessage(client, message); handleChatMessage(client, message);
} }
else if(message.type == "COLLABROOM" && else if(message.data.type == "CLIENT_MESSAGE" &&
message.data.type == "SAVE_REVISION") typeof message.data.payload == 'object' &&
{
handleSaveRevisionMessage(client, message);
}
else if(message.type == "COLLABROOM" &&
message.data.type == "CLIENT_MESSAGE" &&
message.data.payload.type == "suggestUserName") message.data.payload.type == "suggestUserName")
{ {
handleSuggestUserName(client, message); handleSuggestUserName(client, message);
} }
}
//if the message type is unknown, throw an exception //if the message type is unknown, throw an exception
else else
{ {

8
src/static/css/pad.css
View File

@ -80,10 +80,6 @@ a img {
.toolbar ul li a:hover { .toolbar ul li a:hover {
text-decoration: none; text-decoration: none;
} }
.toolbar ul li a span {
position: relative;
top: -2px;
}
.toolbar ul li a:hover { .toolbar ul li a:hover {
background: #fff; background: #fff;
background: -webkit-linear-gradient(#f4f4f4, #e4e4e4); background: -webkit-linear-gradient(#f4f4f4, #e4e4e4);
@ -148,6 +144,7 @@ a img {
background: linear-gradient(#EEE, #F0F0F0) !important; background: linear-gradient(#EEE, #F0F0F0) !important;
} }
.toolbar ul li select { .toolbar ul li select {
background: #fff;
padding: 4px; padding: 4px;
line-height: 22px; /* fix for safari (win/mac) */ line-height: 22px; /* fix for safari (win/mac) */
height: 28px; /* fix for chrome (mac) */ height: 28px; /* fix for chrome (mac) */
@ -157,6 +154,7 @@ a img {
} }
#usericon a { #usericon a {
min-width: 30px; min-width: 30px;
text-align: left;
} }
#usericon a #online_count { #usericon a #online_count {
color: #777; color: #777;
@ -904,7 +902,7 @@ input[type=checkbox] {
.stickyChat { .stickyChat {
background-color: #f1f1f1 !important; background-color: #f1f1f1 !important;
right: 0px !important; right: 0px !important;
top: 36px; top: 37px;
-webkit-border-radius: 0px !important; -webkit-border-radius: 0px !important;
-moz-border-radius: 0px !important; -moz-border-radius: 0px !important;
border-radius: 0px !important; border-radius: 0px !important;

4
src/templates/index.html
View File

@ -132,10 +132,6 @@
<script src="static/custom/index.js"></script> <script src="static/custom/index.js"></script>
<script> <script>
if ((!$.browser.msie) && (!($.browser.mozilla && $.browser.version.indexOf("1.8.") == 0)))
{
document.domain = document.domain; // for comet
}
function go2Name() function go2Name()
{ {