Simplify server-side transformation flow

lib/Document.js

@@ -65,7 +65,7 @@ Document.prototype.dispatchEdit = function(oriConnection, edit) {
 
   // Transform against all edits that have happened in the meantime
 
-  if(oriConnection.sent && (!~this.history.getAllAfter(edit.parent).indexOf(oriConnection.sent) && edit.parent != oriConnection.sent.id)) {
+  /*if(oriConnection.sent && (!~this.history.getAllAfter(edit.parent).indexOf(oriConnection.sent) && edit.parent != oriConnection.sent.id)) {
     // Only transfrom, if it's not one of this edit's ancestors
     console.log('transforming incoming against sent edit:', Changeset.unpack(oriConnection.sent.diff).inspect(), change.inspect(), '->', change.transformAgainst(Changeset.unpack(oriConnection.sent.diff)).inspect())
     change = change.transformAgainst(Changeset.unpack(oriConnection.sent.diff))
@@ -79,12 +79,15 @@ Document.prototype.dispatchEdit = function(oriConnection, edit) {
     console.log('transforming incoming against unsent edits:', Changeset.unpack(newEdit.diff).inspect(), change.inspect(), '->', change.transformAgainst(Changeset.unpack(newEdit.diff)).inspect())
     change = change.transformAgainst(Changeset.unpack(newEdit.diff))
     edit.parent = newEdit.id // update ancestor
-  }.bind(this))
+  }.bind(this))*/
+
+  // ISN'T THE ABOVE ACTUALLY THE SAME AS BELOW?
 
   // Transform against possibly missed edits from history
   this.history.getAllAfter(edit.parent).forEach(function(oldEdit) {
-    console.log('transforming against history:', Changeset.unpack(oldEdit.diff).inspect(), change.inspect(), change.transformAgainst(Changeset.unpack(oldEdit.diff)))
-    change = change.transformAgainst(Changeset.unpack(oldEdit.diff))
+    var historicalCs = Changeset.unpack(oldEdit.diff)
+    console.log('transforming against history:', historicalCs.inspect(), change.inspect(), change.transformAgainst(historicalCs))
+    change = change.transformAgainst(historicalCs)
     edit.parent = oldEdit.id // update ancestor
   })
 
@@ -93,6 +96,7 @@ Document.prototype.dispatchEdit = function(oriConnection, edit) {
   }catch(e) {
     console.warn('Applying edit "'+edit.id+'" failed:', e)
     // Mh. we better tell them...
+    // oriConnection.destroy()
     return
   }
   console.log(this.content)

lib/TextinputAdapter.js

@@ -64,18 +64,19 @@ TextinputAdapter.prototype.retainScrollView = function(selector, main) {
 TextinputAdapter.prototype.retainSelection = function(main) {
   var content = this.getContent()
 
-  // Insert some selection markers (dummy nodes) that will be used to remember the current selection
+  // Construct a changeset with the current selection start and end positions
   var caret = new cs.text.Changeset(
     new cs.text.Insert(content.length, this.textarea.selectionStart, '*', 0),
     new cs.text.Insert(content.length, this.textarea.selectionEnd, '|', 0)
   )
 
   // function should return a changeset
   var change = main()
-
   if(!change) throw new Error('Wrapped function should return applied changeset')
+
+
   caret = caret.transformAgainst(change)
-  
+
   // restore selection after updating contents
   this.textarea.selectionStart = caret[0].pos
   this.textarea.selectionEnd = caret[1].pos