easy-richtextarea 4.0.16 → 4.0.17

package/src/operation/delete.js

@@ -23,6 +23,24 @@ export default class DeleteOperation {
     return this.position;
   }
 
+  transformContent(content) {
+    let start, end;
+
+    start = 0;
+
+    end = this.position;
+
+    const leftContent = content.substring(start, end),
+          contentLength = this.content.length;
+
+    start = this.position + contentLength;
+
+    const rightContent = content.substring(start),
+          transformedContent = leftContent + rightContent;
+
+    return transformedContent;
+  }
+
   transformOperation(operation) {
     const type = operation.getType();
 
@@ -98,24 +116,6 @@ export default class DeleteOperation {
     }
   }
 
-  transformContent(content) {
-    let start, end;
-
-    start = 0;
-
-    end = this.position;
-
-    const leftContent = content.substring(start, end),
-          contentLength = this.content.length;
-
-    start = this.position + contentLength;
-
-    const rightContent = content.substring(start),
-          transformedContent = leftContent + rightContent;
-
-    return transformedContent;
-  }
-
   transformSelection(selection) {
     let transformedSelection;
 

package/src/operation/empty.js

@@ -11,6 +11,12 @@ export default class EmptyOperation {
     return this.type;
   }
 
+  transformContent(content) {
+    const transformedContent = content; ///
+
+    return transformedContent;
+  }
+
   transformOperation(operation) {
     return ((tau, rho) => {
 
@@ -19,12 +25,6 @@ export default class EmptyOperation {
     })(operation, this);
   }
 
-  transformContent(content) {
-    const transformedContent = content; ///
-
-    return transformedContent;
-  }
-
   transformSelection(selection) {
     const transformedSelection = selection.clone();
 

package/src/operation/insert.js

@@ -24,6 +24,24 @@ export default class InsertOperation {
     return this.position;
   }
 
+  transformContent(content) {
+    let start,
+         end;
+
+    start = 0;
+
+    end = this.position;
+
+    const leftContent = content.substring(start, end);
+
+    start = this.position;
+
+    const rightContent = content.substring(start),
+          transformedContent = leftContent + this.content + rightContent;
+
+    return transformedContent;
+  }
+
   transformOperation(operation) {
     const type = operation.getType();
 
@@ -81,24 +99,6 @@ export default class InsertOperation {
     }
   }
 
-  transformContent(content) {
-    let start,
-        end;
-
-    start = 0;
-
-    end = this.position;
-
-    const leftContent = content.substring(start, end);
-
-    start = this.position;
-
-    const rightContent = content.substring(start),
-          transformedContent = leftContent + this.content + rightContent;
-
-    return transformedContent;
-  }
-
   transformSelection(selection) {
     let transformedSelection;
 

package/src/richTextarea.js

@@ -245,10 +245,14 @@ export default class RichTextarea extends Element {
     const operation = this.undoBuffer.undo();
 
     if (operation !== null) {
-      const undoable = false;
+      const undoable = false,
+            selection = Selection.fromOperation(operation),
+            setPreviousSelection = false;
 
       this.applyOperation(operation);
 
+      this.setSelection(selection, setPreviousSelection);
+
       this.intermediateHandler(event, element, undoable);
     }
   }
@@ -257,10 +261,14 @@ export default class RichTextarea extends Element {
     const operation = this.undoBuffer.redo();
 
     if (operation !== null) {
-      const undoable = false;
+      const undoable = false,
+            selection = Selection.fromOperation(operation),
+            setPreviousSelection = false;
 
       this.applyOperation(operation);
 
+      this.setSelection(selection, setPreviousSelection);
+
       this.intermediateHandler(event, element, undoable);
     }
   }

package/src/selection.js

@@ -116,6 +116,17 @@ export default class Selection {
     return selection;
   }
 
+  static fromOperation(operation) {
+    const content = operation.getContent(),
+          position = operation.getPosition(),
+          contentLength = content.length,
+          startPosition = position + contentLength,
+          endPosition = startPosition,  ///
+          selection = new Selection(startPosition, endPosition);
+
+    return selection;
+  }
+
   static fromSelection(selection) {
     const startPosition = selection.getStartPosition(),
           endPosition = selection.getEndPosition();
@@ -135,13 +146,6 @@ export default class Selection {
 
   }
 
-  static fromStartPosition(startPosition) {
-    const endPosition = startPosition,  ///
-          selection = new Selection(startPosition, endPosition);
-
-    return selection;
-  }
-
   static fromStartPositionAndEndPosition(startPosition, endPosition) {
     const selection = new Selection(startPosition, endPosition);