mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-23 08:56:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #556 from fourplusone/feature_jquery

Browse source 
added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner
This commit is contained in:
John McLear 2012-03-26 08:10:58 -07:00
commit beec69ac1c
17 changed files with 1187 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/node/handler/PadMessageHandler.js
View file

@ -128,7 +128,11 @@ exports.handleDisconnect = function(client)
//Go trough all user that are still on the pad, and send them the USER_LEAVE message
for(i in pad2sessions[sessionPad])
{
socketio.sockets.sockets[pad2sessions[sessionPad][i]].json.send(messageToTheOtherUsers);
var socket = socketio.sockets.sockets[pad2sessions[sessionPad][i]];
if(socket !== undefined){
socket.json.send(messageToTheOtherUsers);
}
}
});
}
@ -738,9 +742,10 @@ function handleClientReady(client, message)
{
for(var i in pad2sessions[message.padId])
{
if(sessioninfos[pad2sessions[message.padId][i]].author == author)
if(sessioninfos[pad2sessions[message.padId][i]] && sessioninfos[pad2sessions[message.padId][i]].author == author)
{
socketio.sockets.sockets[pad2sessions[message.padId][i]].json.send({disconnect:"userdup"});
var socket = socketio.sockets.sockets[pad2sessions[message.padId][i]];
if(socket) socket.json.send({disconnect:"userdup"});
}
}
}

4
src/node/utils/tar.json
View file

@ -1,6 +1,7 @@
{
"pad.js": [
"jquery.js"
, "underscore.js"
, "security.js"
, "pad.js"
, "ace2_common.js"
@ -25,6 +26,7 @@
]
, "timeslider.js": [
"jquery.js"
, "underscore.js"
, "security.js"
, "undo-xpopup.js"
, "json2.js"
@ -51,6 +53,8 @@
]
, "ace2_inner.js": [
"ace2_common.js"
, "underscore.js"
, "rjquery.js"
, "AttributePoolFactory.js"
, "Changeset.js"
, "security.js"