fixing double late join test fail

lib/ConnectorAdapter.coffee

@@ -15,7 +15,6 @@ adaptConnector = (connector, engine, HB, execution_listener)->
   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..
-        (o.uid.doSync is "true" or o.uid.doSync is true) and # TODO: ensure, that only true is valid
         (HB.getUserId() isnt "_temp")
       connector.broadcast o
 

lib/Engine.coffee

@@ -66,9 +66,10 @@ class Engine
       op_json_array = [op_json_array]
     for op_json in op_json_array
       if fromHB
-        op_json.fromHB = "true" # execute immediately, if 
+        op_json.fromHB = "true" # execute immediately, if
       # $parse_and_execute will return false if $o_json was parsed and executed, otherwise the parsed operadion
       o = @parseOperation op_json
+      o.parsed_from_json = op_json
       if op_json.fromHB?
         o.fromHB = op_json.fromHB
       # @HB.addOperation o

lib/HistoryBuffer.coffee

@@ -84,7 +84,6 @@ class HistoryBuffer
     {
       creator : '_'
       op_number : "_#{@reserved_identifier_counter++}"
-      doSync: false
     }
 
   #
@@ -116,8 +115,10 @@ class HistoryBuffer
 
     for u_name,user of @buffer
       # TODO next, if @state_vector[user] <= state_vector[user]
+      if u_name is "_"
+        continue
       for o_number,o of user
-        if (not o.uid.noOperation?) and o.uid.doSync and unknown(u_name, o_number)
+        if (not o.uid.noOperation?) and unknown(u_name, o_number)
           # its necessary to send it, and not known in state_vector
           o_json = o._encode()
           if o.next_cl? # applies for all ops but the most right delimiter!
@@ -149,7 +150,6 @@ class HistoryBuffer
     uid =
       'creator' : user_id
       'op_number' : @operation_counter[user_id]
-      'doSync' : true
     @operation_counter[user_id]++
     uid
 
@@ -206,14 +206,14 @@ class HistoryBuffer
   # Increment the operation_counter that defines the current state of the Engine.
   #
   addToCounter: (o)->
-    if not @operation_counter[o.uid.creator]?
-      @operation_counter[o.uid.creator] = 0
-    if typeof o.uid.op_number is 'number' and o.uid.creator isnt @getUserId()
+    @operation_counter[o.uid.creator] ?= 0
+    if o.uid.creator isnt @getUserId()
       # TODO: check if operations are send in order
       if o.uid.op_number is @operation_counter[o.uid.creator]
         @operation_counter[o.uid.creator]++
-      else
-        @invokeSync o.uid.creator
+      while @buffer[o.uid.creator][@operation_counter[o.uid.creator]]?
+        @operation_counter[o.uid.creator]++
+      undefined
 
     #if @operation_counter[o.uid.creator] isnt (o.uid.op_number + 1)
       #console.log (@operation_counter[o.uid.creator] - (o.uid.op_number + 1))

lib/Types/BasicTypes.coffee

@@ -114,7 +114,6 @@ module.exports = (HB)->
         if @uid.alt? # could be (safely) undefined
           map_uid = @uid.alt.cloneUid()
           map_uid.sub = @uid.sub
-          map_uid.doSync = false
           map_uid
         else
           undefined
@@ -125,9 +124,6 @@ module.exports = (HB)->
         uid[n] = v
       uid
 
-    dontSync: ()->
-      @uid.doSync = false
-
     #
     # @private
     # If not already done, set the uid
@@ -172,8 +168,9 @@ module.exports = (HB)->
       # We use duck-typing to check if op is instantiated since there
       # could exist multiple classes of $Operation
       #
-      if op?.execute?
-        # is instantiated
+      if op?.execute? or typeof op is "string"
+        # is instantiated, or op is string. Currently "Delimiter" is saved as string 
+        # (in combination with @parent you can retrieve the delimiter..)
         @[name] = op
       else if op?
         # not initialized. Do it when calling $validateSavedOperations()
@@ -350,6 +347,8 @@ module.exports = (HB)->
           if not @prev_cl?
             @prev_cl = @parent.beginning
           if not @origin?
+            @origin = @prev_cl
+          else if @origin is "Delimiter"
             @origin = @parent.beginning
           if not @next_cl?
             @next_cl = @parent.end

lib/Types/StructuredTypes.coffee

@@ -320,10 +320,14 @@ module.exports = (HB)->
           'parent' : @parent.getUid()
           'prev': @prev_cl.getUid()
           'next': @next_cl.getUid()
-          'origin' : @origin.getUid()
           'uid' : @getUid()
           'is_deleted': @is_deleted
         }
+      if @origin.type is "Delimiter"
+        json.origin = "Delimiter"
+      else if @origin isnt @prev_cl
+        json.origin = @origin.getUid()
+
       if @content instanceof types.Operation
         json['content'] = @content.getUid()
       else