Merge branch 'master' into frontend-next

1 files changed, 2 insertions, 6 deletions

diff --git a/lib/ot/editor-socketio-server.js b/lib/ot/editor-socketio-server.js
index d062fa19..7b204539 100755
--- a/lib/ot/editor-socketio-server.js
+++ b/lib/ot/editor-socketio-server.js
@@ -7,7 +7,6 @@ var Server = require('./server');
 var Selection = require('./selection');
 var util = require('util');
 
-var LZString = require('lz-string');
 var logger = require('../logger');
 
 function EditorSocketIOServer(document, operations, docId, mayWrite, operationCallback) {
@@ -40,10 +39,8 @@ EditorSocketIOServer.prototype.addClient = function (socket) {
         revision: this.operations.length,
         clients: this.users
     };
-    socket.emit('doc', LZString.compressToUTF16(JSON.stringify(docOut)));
+    socket.emit('doc', docOut);
     socket.on('operation', function (revision, operation, selection) {
-        operation = LZString.decompressFromUTF16(operation);
-        operation = JSON.parse(operation);
         socket.origin = 'operation';
         self.mayWrite(socket, function (mayWrite) {
             if (!mayWrite) {
@@ -62,7 +59,7 @@ EditorSocketIOServer.prototype.addClient = function (socket) {
                         clients: self.users,
                         force: true
                     };
-                    socket.emit('doc', LZString.compressToUTF16(JSON.stringify(docOut)));
+                    socket.emit('doc', docOut);
                 }, 100);
             }
         });
@@ -129,7 +126,6 @@ EditorSocketIOServer.prototype.onGetOperations = function (socket, base, head) {
     var operations = this.operations.slice(base, head).map(function (op) {
         return op.wrapped.toJSON();
     });
-    operations = LZString.compressToUTF16(JSON.stringify(operations));
     socket.emit('operations', head, operations);
 };