Improved $.callback(), it accepts another instance of $.

totaljs · Jul 7, 2024 · 6fe1fe6 · 6fe1fe6
1 parent 2da3ebd
commit 6fe1fe6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/builders.js b/builders.js
@@ -1389,7 +1389,16 @@ ActionCaller.prototype.finish = function(value) {
 	var self = this;
 	self.finish = null;
 	if (self.options.callback) {
-		self.options.callback(self.error.length ? self.error : null, value === undefined ? self.$.response : value);
+
+		if (self.options.callback instanceof Options) {
+			let $ = self.options.callback;
+			if (self.error.length)
+				$.invalid(self.error);
+			else
+				$.callback(value === undefined ? self.$.response : value);
+		} else
+			self.options.callback(self.error.length ? self.error : null, value === undefined ? self.$.response : value);
+
 		self.options.callback = null;
 	}
 };

diff --git a/changelog.txt b/changelog.txt
@@ -8,6 +8,7 @@
 - added `FILESTORAGE().copy(id, path, [callback(err, meta)])`
 - fixed formatting `0` number in the `Tangular.format` helper
 - improved `$.invalid()` method, now it returns `ErrorBuilder`
+- improved `$.callback()`, it accepts another instance of `$`
 
 ========================
 0.0.3