stop chopping trailing retain

Author: jhchen

lib/delta.js

@@ -107,14 +107,6 @@ Delta.prototype.reduce = function (predicate, initial) {
   return this.ops.reduce(predicate, initial);
 };
 
-Delta.prototype.chop = function () {
-  var lastOp = this.ops[this.ops.length - 1];
-  if (lastOp && lastOp.retain && !lastOp.attributes) {
-    this.ops.pop();
-  }
-  return this;
-};
-
 Delta.prototype.length = function () {
   return this.reduce(function (length, elem) {
     return length + op.length(elem);
@@ -172,7 +164,7 @@ Delta.prototype.compose = function (other) {
       }
     }
   }
-  return delta.chop();
+  return delta;
 };
 
 Delta.prototype.concat = function (other) {
@@ -229,7 +221,7 @@ Delta.prototype.diff = function (other, index) {
       length -= opLength;
     }
   });
-  return delta.chop();
+  return delta;
 };
 
 Delta.prototype.eachLine = function (predicate, newline) {
@@ -288,7 +280,7 @@ Delta.prototype.transform = function (other, priority) {
       }
     }
   }
-  return delta.chop();
+  return delta;
 };
 
 Delta.prototype.transformPosition = function (index, priority) {

test/delta/compose.js

@@ -96,13 +96,6 @@ describe('compose()', function () {
     expect(a.compose(b)).toEqual(expected);
   });
 
-  it('retain more than length of text', function () {
-    var a = new Delta().insert('Hello');
-    var b = new Delta().retain(10);
-    var expected = new Delta().insert('Hello');
-    expect(a.compose(b)).toEqual(expected);
-  });
-
   it('retain empty embed', function () {
     var a = new Delta().insert(1);
     var b = new Delta().retain(1);

test/delta/diff.js

@@ -19,7 +19,7 @@ describe('diff()', function () {
   it('retain', function () {
     var a = new Delta().insert('A');
     var b = new Delta().insert('A');
-    var expected = new Delta();
+    var expected = new Delta().retain(1);
     expect(a.diff(b)).toEqual(expected);
   });
 
@@ -33,14 +33,14 @@ describe('diff()', function () {
   it('object attributes', function () {
     var a = new Delta().insert('A', { font: { family: 'Helvetica', size: '15px' } });
     var b = new Delta().insert('A', { font: { family: 'Helvetica', size: '15px' } });
-    var expected = new Delta();
+    var expected = new Delta().retain(1);
     expect(a.diff(b)).toEqual(expected);
   });
 
   it('embed integer match', function () {
     var a = new Delta().insert(1);
     var b = new Delta().insert(1);
-    var expected = new Delta();
+    var expected = new Delta().retain(1);
     expect(a.diff(b)).toEqual(expected);
   });
 
@@ -54,7 +54,7 @@ describe('diff()', function () {
   it('embed object match', function () {
     var a = new Delta().insert({ image: 'http://quilljs.com' });
     var b = new Delta().insert({ image: 'http://quilljs.com' });
-    var expected = new Delta();
+    var expected = new Delta().retain(1);
     expect(a.diff(b)).toEqual(expected);
   });
 

test/delta/helpers.js

@@ -29,26 +29,6 @@ describe('helpers', function () {
     });
   });
 
-  describe('chop()', function () {
-    it('retain', function () {
-      var delta = new Delta().insert('Test').retain(4);
-      var expected = new Delta().insert('Test');
-      expect(delta.chop()).toEqual(expected);
-    });
-
-    it('insert', function () {
-      var delta = new Delta().insert('Test');
-      var expected = new Delta().insert('Test');
-      expect(delta.chop()).toEqual(expected);
-    });
-
-    it('formatted retain', function () {
-      var delta = new Delta().insert('Test').retain(4, { bold: true });
-      var expected = new Delta().insert('Test').retain(4, { bold: true });
-      expect(delta.chop()).toEqual(expected);
-    })
-  });
-
   describe('eachLine()', function () {
     var spy = { predicate: function () {} };
 

test/delta/transform.js

@@ -8,7 +8,7 @@ describe('transform()', function () {
     var a2 = new Delta(a1);
     var b2 = new Delta(b1);
     var expected1 = new Delta().retain(1).insert('B');
-    var expected2 = new Delta().insert('B');
+    var expected2 = new Delta().insert('B').retain(1);
     expect(a1.transform(b1, true)).toEqual(expected1);
     expect(a2.transform(b2, false)).toEqual(expected2);
   });
@@ -51,7 +51,7 @@ describe('transform()', function () {
   it('retain + insert', function () {
     var a = new Delta().retain(1, { color: 'blue' });
     var b = new Delta().insert('B');
-    var expected = new Delta().insert('B');
+    var expected = new Delta().insert('B').retain(1);
     expect(a.transform(b, true)).toEqual(expected);
   });
 
@@ -61,7 +61,7 @@ describe('transform()', function () {
     var a2 = new Delta().retain(1, { color: 'blue' });
     var b2 = new Delta().retain(1, { bold: true, color: 'red' });
     var expected1 = new Delta().retain(1, { bold: true });
-    var expected2 = new Delta();
+    var expected2 = new Delta().retain(1);
     expect(a1.transform(b1, true)).toEqual(expected1);
     expect(b2.transform(a2, true)).toEqual(expected2);
   });
@@ -90,7 +90,7 @@ describe('transform()', function () {
     var a2 = new Delta(a1);
     var b2 = new Delta(b1);
     var expected1 = new Delta().retain(1).insert('e').delete(1).retain(2).insert('ow');
-    var expected2 = new Delta().retain(2).insert('si').delete(1);
+    var expected2 = new Delta().retain(2).insert('si').delete(1).retain(2);
     expect(a1.transform(b1, false)).toEqual(expected1);
     expect(b2.transform(a2, false)).toEqual(expected2);
   });
@@ -101,7 +101,7 @@ describe('transform()', function () {
     var a2 = new Delta(a1);
     var b2 = new Delta(b1);
     var expected1 = new Delta().retain(5).insert('bb');
-    var expected2 = new Delta().retain(3).insert('aa');
+    var expected2 = new Delta().retain(3).insert('aa').retain(2);
     expect(a1.transform(b1, true)).toEqual(expected1);
     expect(b2.transform(a2, false)).toEqual(expected2);
   });
@@ -112,7 +112,7 @@ describe('transform()', function () {
     var expected1 = new Delta().retain(5).insert('bb');
     var a2 = new Delta(a1);
     var b2 = new Delta(b1);
-    var expected2 = new Delta().insert('aa');
+    var expected2 = new Delta().insert('aa').retain(5);
     expect(a1.transform(b1, false)).toEqual(expected1);
     expect(b2.transform(a2, false)).toEqual(expected2);
   });