[bug-fix] multiple image position and history fix

we-miks · Apr 30, 2020 · fcd50a2 · fcd50a2
1 parent 73c8c4b
commit fcd50a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/image-handlers.js b/image-handlers.js
@@ -130,15 +130,18 @@ class ImageHandlers {
                     }
                 }
 
-                if(appliedDeltas && appliedDeltas.length !== 0) {
+                if(typeof(appliedDeltas) !== 'undefined') {
+                    if(appliedDeltas && appliedDeltas.length !== 0) {
 
-                    let composedAppliedDelta = new Delta();
+                        let composedAppliedDelta = new Delta();
 
-                    appliedDeltas.forEach((delta) => {
-                        composedAppliedDelta = composedAppliedDelta.compose(delta);
-                    });
+                        appliedDeltas.forEach((delta) => {
+                            composedAppliedDelta = composedAppliedDelta.compose(delta);
+                        });
+
+                        changeDelta = composedAppliedDelta.transform(changeDelta);
+                    }
 
-                    changeDelta = composedAppliedDelta.transform(changeDelta);
                     appliedDeltas.push(changeDelta);
                 }
 

diff --git a/modules/history.js b/modules/history.js
@@ -18,10 +18,7 @@ class History {
             this.editor = editor;
             this.editor.on(EditorEvents.editorTextChanged, ({delta, oldDelta}) => {
                 let self = this;
-                // Wait for local fixing delta to be applied in this cycle before get quill content in record function.
-                setTimeout(() => {
-                    self.record(delta, oldDelta);
-                }, 1);
+                self.record(delta, oldDelta);
             });
 
             this.quill.keyboard.addBinding({ key: 'Z', shortKey: true }, this.undo.bind(this));
@@ -62,7 +59,9 @@ class History {
 
         if (changeDelta.ops.length === 0) return;
         this.stack.redo = [];
-        let undoDelta = this.editor.getEditorContents().diff(oldDelta);
+
+        let editorContents = this.editor.getEditorContents();
+        let undoDelta = editorContents.diff(oldDelta);
         let timestamp = Date.now();
         if (this.lastRecorded + this.options.delay > timestamp && this.stack.undo.length > 0) {
             let delta = this.stack.undo.pop();