From c56aded1e320fccb9834a92fb5e0ec307480ca85 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Wed, 29 Sep 2021 12:41:06 +0200
Subject: [PATCH] Don't store before editor load

---
 src/editor/model/Editor.js | 6 +++---
 src/utils/Sorter.js        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js
index 2be2988fa..76917065e 100644
--- a/src/editor/model/Editor.js
+++ b/src/editor/model/Editor.js
@@ -123,7 +123,7 @@ export default Backbone.Model.extend({
       this.get('readyCanvas') &&
       !this.get('ready')
     ) {
-      this.set('ready', 1);
+      this.set('ready', true);
     }
   },
 
@@ -171,7 +171,7 @@ export default Backbone.Model.extend({
     if (sm && sm.canAutoload()) {
       this.load(postLoad);
     } else {
-      postLoad();
+      setTimeout(postLoad);
     }
   },
 
@@ -262,7 +262,7 @@ export default Backbone.Model.extend({
    * */
   handleUpdates(model, val, opt = {}) {
     // Component has been added temporarily - do not update storage or record changes
-    if (opt.temporary || opt.noCount || opt.avoidStore) {
+    if (opt.temporary || opt.noCount || opt.avoidStore || !this.get('ready')) {
       return;
     }
 
diff --git a/src/utils/Sorter.js b/src/utils/Sorter.js
index 0c56cb5f0..38e2fe185 100644
--- a/src/utils/Sorter.js
+++ b/src/utils/Sorter.js
@@ -1044,8 +1044,8 @@ export default Backbone.View.extend({
     const onEnd = this.onEnd;
     const { target, lastPos } = this;
     let srcModel;
-    off(container, 'mousemove dragover pointermove', this.onMove);
-    off(docs, 'mouseup dragend touchend pointerup', this.endMove);
+    off(container, 'mousemove dragover', this.onMove);
+    off(docs, 'mouseup dragend touchend', this.endMove);
     off(docs, 'keydown', this.rollback);
     this.plh.style.display = 'none';