dom-ot - npm Package Compare versions

Comparing version 1.1.5 to 1.1.6

lib/adapter-mutationSummary.js

@@ -63,9 +63,2 @@ var Manipulate = require('./ops/manipulate')
 
-  if (Array.isArray(summary.added)) {
-    summary.added
-    //.reverse()// traverse added elements in reverse order, because MutationSummary puts children first for some reason
-    .forEach(function(node) {
-      oplist.push(new Move(null, pathTo(node, rootNode), serialize(node)))
-    })
-  }
   
@@ -117,2 +110,36 @@ if (Array.isArray(summary.removed)) {
   }
+
+  if (Array.isArray(summary.reordered)) {
+    summary.reordered.forEach(function(node) {
+      var oldSibling = summary.getOldPreviousSibling(node)
+        , newPath = pathTo(node, rootNode)
+        , oldPath
+
+      if(oldSibling) {
+        // My older brother
+        oldPath = pathTo(oldSibling, rootNode)
+        oldPath[oldPath.length-1]++
+      }else {
+        // I was the oldest
+        oldPath = pathTo(summary.getOldParentNode(node), rootNode)
+        oldPath.push(0)
+      }
+      oplist.push(new Move(oldPath, newPath))
+    })
+  }
+
+  // transform old paths against each other in the order of operations
+  oplist.forEach(function(op, i) {
+    oplist.slice(i+1).forEach(function(op2) {
+      op2.transformAgainst(op)
+    })
+  })
+
+  if (Array.isArray(summary.added)) {
+    summary.added
+    //.reverse()// traverse added elements in reverse order, because MutationSummary puts children first for some reason
+    .forEach(function(node) {
+      oplist.push(new Move(null, pathTo(node, rootNode), serialize(node)))
+    })
+  }
   
@@ -138,21 +165,2 @@ // Convergence over intention preservation
 
-  if (Array.isArray(summary.reordered)) {
-    summary.reordered.forEach(function(node) {
-      var oldSibling = summary.getOldPreviousSibling(node)
-        , newPath = pathTo(node, rootNode)
-        , oldPath
-
-      if(oldSibling) {
-        // My older brother
-        oldPath = pathTo(oldSibling, rootNode)
-        oldPath[oldPath.length-1]++
-      }else {
-        // I was the oldest
-        oldPath = pathTo(summary.getOldParentNode(node), rootNode)
-        oldPath.push(0)
-      }
-      oplist.push(new Move(oldPath, newPath))
-    })
-  }
-
   if(summary.attributeChanged) {
@@ -159,0 +167,0 @@ for(var attr in summary.attributeChanged) {

package.json

 {
   "name": "dom-ot",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "Operational transform library for DOM operations (conforms to shareJS' spec)",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

21725

increased by0.92%

Lines of code

579

increased by1.05%

No dependency changes