From 161e87aeeaa0b6483d8dd831f7dd3e4618bbd07d Mon Sep 17 00:00:00 2001
From: lyzerk <alm.ozdmr@gmail.com>
Date: Wed, 13 May 2020 23:26:49 +0300
Subject: [PATCH] 1.5.0 undo/redo bug fix. toggle (on/off)

---
 demo/demo.html   | 14 +++++++++-----
 package.json     |  2 +-
 src/index.js     | 22 +++++++++++++++++++---
 src/index.min.js |  2 +-
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/demo/demo.html b/demo/demo.html
index 064539a..d8ec274 100644
--- a/demo/demo.html
+++ b/demo/demo.html
@@ -35,7 +35,7 @@
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/3.4.0/fabric.min.js"></script>
     <script src="libs/jsonviewer.js"></script>
-    <script src="../src/index.min.js"></script>
+    <script src="../src/index.js"></script>
     <script>
         let isDrawingMode = false;
         const canvas = new fabric.Canvas(document.querySelector('canvas'));
@@ -103,11 +103,15 @@
 
             // remove objects
             if (activeObjects.length > 0) {
-                activeObjects.forEach((object) => {
-                    if (!object.isEditing) {
-                        canvas.remove(object);
+                canvas.offHistory();
+
+                for (var i = 0; i < activeObjects.length; i++) {
+                    if (!activeObjects[i].isEditing) {
+                        canvas.remove(activeObjects[i]);
                     }
-                });
+                }
+
+                canvas.onHistory();
             }
         }
         
diff --git a/package.json b/package.json
index 01fe553..74ed46f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fabric-history",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Undo and redo implementations on fabric.js",
   "main": "src/index.min.js",
   "scripts": {
diff --git a/src/index.js b/src/index.js
index 19562d7..2cd2045 100644
--- a/src/index.js
+++ b/src/index.js
@@ -88,7 +88,7 @@ fabric.Canvas.prototype.undo = function (callback) {
   if (history) {
     // Push the current state to the redo history
     this.historyRedo.push(this._historyNext());
-
+    this.historyNextState = history;
     this._loadHistory(history, 'history:undo', callback);
   } else {
     this.historyProcessing = false;
@@ -107,7 +107,7 @@ fabric.Canvas.prototype.redo = function (callback) {
   if (history) {
     // Every redo action is actually a new action to the undo history
     this.historyUndo.push(this._historyNext());
-    
+    this.historyNextState = history;
     this._loadHistory(history, 'history:redo', callback);
   } else {
     this.historyProcessing = false;
@@ -134,4 +134,20 @@ fabric.Canvas.prototype.clearHistory = function() {
   this.historyUndo = [];
   this.historyRedo = [];
   this.fire('history:clear');
-}
\ No newline at end of file
+}
+
+/**
+ * Off the history
+ */
+fabric.Canvas.prototype.offHistory = function() {
+  this.historyProcessing = true;
+}
+
+/**
+ * On the history
+ */
+fabric.Canvas.prototype.onHistory = function() {
+  this.historyProcessing = false;
+
+  this._historySaveAction();
+}
diff --git a/src/index.min.js b/src/index.min.js
index 7baf53b..5dd7ebd 100644
--- a/src/index.min.js
+++ b/src/index.min.js
@@ -1 +1 @@
-fabric.Canvas.prototype.initialize=function(t){return function(...i){return t.call(this,...i),this._historyInit(),this}}(fabric.Canvas.prototype.initialize),fabric.Canvas.prototype.dispose=function(t){return function(...i){return t.call(this,...i),this._historyDispose(),this}}(fabric.Canvas.prototype.dispose),fabric.Canvas.prototype._historyNext=function(){return JSON.stringify(this.toDatalessJSON(this.extraProps))},fabric.Canvas.prototype._historyEvents=function(){return{"object:added":this._historySaveAction,"object:removed":this._historySaveAction,"object:modified":this._historySaveAction,"object:skewing":this._historySaveAction}},fabric.Canvas.prototype._historyInit=function(){this.historyUndo=[],this.historyRedo=[],this.extraProps=["selectable"],this.historyNextState=this._historyNext(),this.on(this._historyEvents())},fabric.Canvas.prototype._historyDispose=function(){this.off(this._historyEvents())},fabric.Canvas.prototype._historySaveAction=function(){if(this.historyProcessing)return;const t=this.historyNextState;this.historyUndo.push(t),this.historyNextState=this._historyNext(),this.fire("history:append",{json:t})},fabric.Canvas.prototype.undo=function(t){this.historyProcessing=!0;const i=this.historyUndo.pop();i?(this.historyRedo.push(this._historyNext()),this._loadHistory(i,"history:undo",t)):this.historyProcessing=!1},fabric.Canvas.prototype.redo=function(t){this.historyProcessing=!0;const i=this.historyRedo.pop();i?(this.historyUndo.push(this._historyNext()),this._loadHistory(i,"history:redo",t)):this.historyProcessing=!1},fabric.Canvas.prototype._loadHistory=function(t,i,s){var o=this;this.loadFromJSON(t,function(){o.renderAll(),o.fire(i),o.historyProcessing=!1,s&&"function"==typeof s&&s()})},fabric.Canvas.prototype.clearHistory=function(){this.historyUndo=[],this.historyRedo=[],this.fire("history:clear")};
\ No newline at end of file
+fabric.Canvas.prototype.initialize=function(t){return function(...i){return t.call(this,...i),this._historyInit(),this}}(fabric.Canvas.prototype.initialize),fabric.Canvas.prototype.dispose=function(t){return function(...i){return t.call(this,...i),this._historyDispose(),this}}(fabric.Canvas.prototype.dispose),fabric.Canvas.prototype._historyNext=function(){return JSON.stringify(this.toDatalessJSON(this.extraProps))},fabric.Canvas.prototype._historyEvents=function(){return{"object:added":this._historySaveAction,"object:removed":this._historySaveAction,"object:modified":this._historySaveAction,"object:skewing":this._historySaveAction}},fabric.Canvas.prototype._historyInit=function(){this.historyUndo=[],this.historyRedo=[],this.extraProps=["selectable"],this.historyNextState=this._historyNext(),this.on(this._historyEvents())},fabric.Canvas.prototype._historyDispose=function(){this.off(this._historyEvents())},fabric.Canvas.prototype._historySaveAction=function(){if(this.historyProcessing)return;const t=this.historyNextState;this.historyUndo.push(t),this.historyNextState=this._historyNext(),this.fire("history:append",{json:t})},fabric.Canvas.prototype.undo=function(t){this.historyProcessing=!0;const i=this.historyUndo.pop();i?(this.historyRedo.push(this._historyNext()),this.historyNextState=i,this._loadHistory(i,"history:undo",t)):this.historyProcessing=!1},fabric.Canvas.prototype.redo=function(t){this.historyProcessing=!0;const i=this.historyRedo.pop();i?(this.historyUndo.push(this._historyNext()),this.historyNextState=i,this._loadHistory(i,"history:redo",t)):this.historyProcessing=!1},fabric.Canvas.prototype._loadHistory=function(t,i,s){var o=this;this.loadFromJSON(t,function(){o.renderAll(),o.fire(i),o.historyProcessing=!1,s&&"function"==typeof s&&s()})},fabric.Canvas.prototype.clearHistory=function(){this.historyUndo=[],this.historyRedo=[],this.fire("history:clear")},fabric.Canvas.prototype.offHistory=function(){this.historyProcessing=!0},fabric.Canvas.prototype.onHistory=function(){this.historyProcessing=!1,this._historySaveAction()};
\ No newline at end of file