Fixing set() by passing batch on recursive call, removing onset()

avoidwork · Feb 4, 2017 · c436884 · c436884
1 parent 213d643
commit c436884
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -269,7 +269,7 @@ Event listener for transforming an API response, receives `body`, `status` & `he
 **onset**
 _Function_
 
-Event listener for when a record is set, receives an `Array`, `Boolean` for batch operation, & `Boolean` for reversion.
+Event listener for when a record is set, receives an `Array`.
 
 **onsync**
 _Function_

diff --git a/lib/haro.es6.js b/lib/haro.es6.js
@@ -4,7 +4,7 @@
  * @author Jason Mulligan <jason.mulligan@avoidwork.com>
  * @copyright 2017
  * @license BSD-3-Clause
- * @version 3.1.12
+ * @version 3.1.13
  */
 "use strict";
 
@@ -879,12 +879,10 @@
 						}
 
 						if (og) {
-							this.set(key, og, true, true).then(() => {
+							this.set(key, og, batch, true).then(() => {
 								if (this.logging) {
 									console.log("Reverted", key);
 								}
-
-								this.onset(this.list(key, og), batch, true);
 							}).catch(() => {
 								if (this.logging) {
 									console.log("Failed to revert", key);
@@ -1157,7 +1155,7 @@
 	}
 
 	factory.transform = cast;
-	factory.version = "3.1.12";
+	factory.version = "3.1.13";
 
 	// Node, AMD & window supported
 	if (typeof exports !== "undefined") {

diff --git a/lib/haro.js b/lib/haro.js
@@ -4,7 +4,7 @@
  * @author Jason Mulligan <jason.mulligan@avoidwork.com>
  * @copyright 2017
  * @license BSD-3-Clause
- * @version 3.1.12
+ * @version 3.1.13
  */
 "use strict";
 
@@ -1074,12 +1074,10 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 							}
 
 							if (og) {
-								_this13.set(key, og, true, true).then(function () {
+								_this13.set(key, og, batch, true).then(function () {
 									if (_this13.logging) {
 										console.log("Reverted", key);
 									}
-
-									_this13.onset(_this13.list(key, og), batch, true);
 								}).catch(function () {
 									if (_this13.logging) {
 										console.log("Failed to revert", key);
@@ -1408,7 +1406,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 	}
 
 	factory.transform = cast;
-	factory.version = "3.1.12";
+	factory.version = "3.1.13";
 
 	// Node, AMD & window supported
 	if (typeof exports !== "undefined") {

diff --git a/lib/haro.min.js b/lib/haro.min.js
diff --git a/lib/haro.min.js.map b/lib/haro.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haro",
-  "version": "3.1.12",
+  "version": "3.1.13",
   "description": "Harō is a modern immutable DataStore",
   "main": "lib/haro.es6.js",
   "scripts": {

diff --git a/src/haro.js b/src/haro.js
@@ -527,12 +527,10 @@
 						}
 
 						if (og) {
-							this.set(key, og, true, true).then(() => {
+							this.set(key, og, batch, true).then(() => {
 								if (this.logging) {
 									console.log("Reverted", key);
 								}
-
-								this.onset(this.list(key, og), batch, true);
 							}).catch(() => {
 								if (this.logging) {
 									console.log("Failed to revert", key);