Skip to content

Send document identifier when emitting doc #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Send document identifier when emitting doc #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1db42b3
Send document identifier when emitting `doc`
Jul 8, 2013
6830af4
Enable multi document editing
Jul 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions lib/codemirror-adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,20 @@ ot.CodeMirrorAdapter = (function () {
function CodeMirrorAdapter (cm) {
this.cm = cm;
this.ignoreNextChange = false;
this.attach();
}

// Add event listeners to the CodeMirror instance.
CodeMirrorAdapter.prototype.attach = function(){
bind(this, 'onChange');
bind(this, 'onCursorActivity');
bind(this, 'onFocus');
bind(this, 'onBlur');
cm.on('change', this.onChange);
cm.on('cursorActivity', this.onCursorActivity);
cm.on('focus', this.onFocus);
cm.on('blur', this.onBlur);
this.cm.on('change', this.onChange);
this.cm.on('cursorActivity', this.onCursorActivity);
this.cm.on('focus', this.onFocus);
this.cm.on('blur', this.onBlur);
this.attached = true;
}

// Removes all event listeners from the CodeMirror instance.
Expand All @@ -26,6 +31,7 @@ ot.CodeMirrorAdapter = (function () {
this.cm.off('cursorActivity', this.onCursorActivity);
this.cm.off('focus', this.onFocus);
this.cm.off('blur', this.onBlur);
this.attached = false;
};

function cmpPos (a, b) {
Expand Down Expand Up @@ -131,7 +137,7 @@ ot.CodeMirrorAdapter = (function () {

// Apply an operation to a CodeMirror instance.
CodeMirrorAdapter.applyOperationToCodeMirror = function (operation, cm) {
cm.operation(function () {
var callback = function () {
var ops = operation.ops;
var index = 0; // holds the current index into CodeMirror's content
for (var i = 0, l = ops.length; i < l; i++) {
Expand All @@ -147,7 +153,12 @@ ot.CodeMirrorAdapter = (function () {
cm.replaceRange('', from, to);
}
}
});
};
if(cm.operation){
cm.operation(callback)
}else{
callback();
}
};

CodeMirrorAdapter.prototype.registerCallbacks = function (cb) {
Expand Down
6 changes: 5 additions & 1 deletion lib/editor-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,11 @@ ot.EditorClient = (function () {
this.serverAdapter.registerCallbacks({
client_left: function (clientId) { self.onClientLeft(clientId); },
set_name: function (clientId, name) { self.getClientObject(clientId).setName(name); },
ack: function () { self.serverAck(); },
ack: function (docId) {
if(docId == self.docId){
self.serverAck();
}
},
operation: function (operation) {
self.applyServer(TextOperation.fromJSON(operation));
},
Expand Down
22 changes: 14 additions & 8 deletions lib/editor-socketio-server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ EditorSocketIOServer.prototype.addClient = function (socket) {
.emit('doc', {
str: this.document,
revision: this.operations.length,
clients: this.users
clients: this.users,
docId: this.docId
})
.on('operation', function (revision, operation, cursor) {
.on('operation', function (docId, revision, operation, cursor) {
if(docId != self.docId){
return;
}
self.mayWrite(socket, function (mayWrite) {
if (!mayWrite) {
console.log("User doesn't have the right to edit.");
Expand All @@ -44,7 +48,10 @@ EditorSocketIOServer.prototype.addClient = function (socket) {
self.onOperation(socket, revision, operation, cursor);
});
})
.on('cursor', function (obj) {
.on('cursor', function (docId, obj) {
if(docId != this.docId){
return;
}
self.mayWrite(socket, function (mayWrite) {
if (!mayWrite) {
console.log("User doesn't have the right to edit.");
Expand Down Expand Up @@ -78,11 +85,10 @@ EditorSocketIOServer.prototype.onOperation = function (socket, revision, operati
try {
var clientId = socket.id;
var wrappedPrime = this.receiveOperation(revision, wrapped);
console.log("new operation: " + wrapped);
this.getClient(clientId).cursor = wrappedPrime.meta;
socket.emit('ack');
socket.emit('ack', this.docId);
socket.broadcast['in'](this.docId).emit(
'operation', clientId,
'operation', clientId, this.docId,
wrappedPrime.wrapped.toJSON(), wrappedPrime.meta
);
} catch (exc) {
Expand All @@ -97,7 +103,7 @@ EditorSocketIOServer.prototype.updateCursor = function (socket, cursor) {
} else {
delete this.getClient(clientId).cursor;
}
socket.broadcast['in'](this.docId).emit('cursor', clientId, cursor);
socket.broadcast['in'](this.docId).emit('cursor', clientId, this.docId, cursor);
};

EditorSocketIOServer.prototype.setName = function (socket, name) {
Expand All @@ -116,4 +122,4 @@ EditorSocketIOServer.prototype.onDisconnect = function (socket) {
socket.broadcast['in'](this.docId).emit('client_left', clientId);
};

module.exports = EditorSocketIOServer;
module.exports = EditorSocketIOServer;
20 changes: 10 additions & 10 deletions lib/socketio-adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@ ot.SocketIOAdapter = (function () {
self.trigger('set_name', clientId, name);
})
.on('ack', function () { self.trigger('ack'); })
.on('operation', function (clientId, operation, cursor) {
self.trigger('operation', operation);
self.trigger('cursor', clientId, cursor);
.on('operation', function (clientId, docId, operation, cursor) {
self.trigger('operation', docId, operation);
self.trigger('cursor', clientId, docId, cursor);
})
.on('cursor', function (clientId, cursor) {
self.trigger('cursor', clientId, cursor);
.on('cursor', function (clientId, docId, cursor) {
self.trigger('cursor', clientId, docId, cursor);
})
.on('reconnect', function () {
self.trigger('reconnect');
});
}

SocketIOAdapter.prototype.sendOperation = function (revision, operation, cursor) {
this.socket.emit('operation', revision, operation, cursor);
SocketIOAdapter.prototype.sendOperation = function (docId, revision, operation, cursor) {
this.socket.emit('operation', docId, revision, operation, cursor);
};

SocketIOAdapter.prototype.sendCursor = function (cursor) {
this.socket.emit('cursor', cursor);
SocketIOAdapter.prototype.sendCursor = function (docId, cursor) {
this.socket.emit('cursor', docId, cursor);
};

SocketIOAdapter.prototype.registerCallbacks = function (cb) {
Expand All @@ -47,4 +47,4 @@ ot.SocketIOAdapter = (function () {

return SocketIOAdapter;

}());
}());