bumb version

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "homepage": "https://github.com/DadaMonad/yjs",
   "authors": [
     "Kevin Jahns <kevin.jahns@rwth-aachen.de>"

build/node/ConnectorAdapter.js

@@ -8,16 +8,6 @@ adaptConnector = function(connector, engine, HB, execution_listener) {
     f = ConnectorClass[name];
     connector[name] = f;
   }
-  connector.setIsBoundToY();
-  send_ = function(o) {
-    if ((o.uid.creator === HB.getUserId()) && (typeof o.uid.op_number !== "string") && (HB.getUserId() !== "_temp")) {
-      return connector.broadcast(o);
-    }
-  };
-  if (connector.invokeSync != null) {
-    HB.setInvokeSyncHandler(connector.invokeSync);
-  }
-  execution_listener.push(send_);
   encode_state_vector = function(v) {
     var results, value;
     results = [];
@@ -61,11 +51,21 @@ adaptConnector = function(connector, engine, HB, execution_listener) {
   if (connector.receive_handlers == null) {
     connector.receive_handlers = [];
   }
-  return connector.receive_handlers.push(function(sender, op) {
+  connector.receive_handlers.push(function(sender, op) {
     if (op.uid.creator !== HB.getUserId()) {
       return engine.applyOp(op);
     }
   });
+  connector.setIsBoundToY();
+  send_ = function(o) {
+    if ((o.uid.creator === HB.getUserId()) && (typeof o.uid.op_number !== "string") && (HB.getUserId() !== "_temp")) {
+      return connector.broadcast(o);
+    }
+  };
+  if (connector.invokeSync != null) {
+    HB.setInvokeSyncHandler(connector.invokeSync);
+  }
+  return execution_listener.push(send_);
 };
 
 module.exports = adaptConnector;

build/node/Operations/Basic.js

@@ -442,7 +442,7 @@ module.exports = function() {
       if (callLater) {
         this.parent.callOperationSpecificDeleteEvents(this, o);
       }
-      if ((this.prev_cl != null) && this.prev_cl.isDeleted()) {
+      if ((this.prev_cl != null) && this.prev_cl.isDeleted() && this.prev_cl.garbage_collected !== true) {
         return this.prev_cl.applyDelete();
       }
     };

lib/ConnectorAdapter.coffee

@@ -10,18 +10,6 @@ adaptConnector = (connector, engine, HB, execution_listener)->
   for name, f of ConnectorClass
     connector[name] = f
 
-  connector.setIsBoundToY()
-
-  send_ = (o)->
-    if (o.uid.creator is HB.getUserId()) and
-        (typeof o.uid.op_number isnt "string") and # TODO: i don't think that we need this anymore..
-        (HB.getUserId() isnt "_temp")
-      connector.broadcast o
-
-  if connector.invokeSync?
-    HB.setInvokeSyncHandler connector.invokeSync
-
-  execution_listener.push send_
   # For the XMPPConnector: lets send it as an array
   # therefore, we have to restructure it later
   encode_state_vector = (v)->
@@ -57,5 +45,17 @@ adaptConnector = (connector, engine, HB, execution_listener)->
     if op.uid.creator isnt HB.getUserId()
       engine.applyOp op
 
+  connector.setIsBoundToY()
+
+  send_ = (o)->
+    if (o.uid.creator is HB.getUserId()) and
+        (typeof o.uid.op_number isnt "string") and # TODO: i don't think that we need this anymore..
+        (HB.getUserId() isnt "_temp")
+      connector.broadcast o
+
+  if connector.invokeSync?
+    HB.setInvokeSyncHandler connector.invokeSync
+
+  execution_listener.push send_
 
 module.exports = adaptConnector

lib/Operations/Basic.coffee

@@ -430,7 +430,7 @@ module.exports = ()->
       super garbagecollect
       if callLater
         @parent.callOperationSpecificDeleteEvents(this, o)
-      if @prev_cl? and @prev_cl.isDeleted()
+      if @prev_cl? and @prev_cl.isDeleted() and @prev_cl.garbage_collected isnt true
         # garbage collect prev_cl
         @prev_cl.applyDelete()
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "A Framework that enables Real-Time Collaboration on arbitrary data structures.",
   "main": "./build/node/y.js",
   "scripts": {