total5 0.0.16-3 → 0.0.16-4

package/builders.js

@@ -153,7 +153,13 @@ Options.prototype.promisify = function(fn, a, b, c) {
 	});
 };
 
-Options.prototype.status = function() {};
+Options.prototype.status = function(a, b, c, d) {
+	this.status2?.call(this, a, b, c, d);
+};
+
+Options.prototype.progress = function(a, b, c, d) {
+	this.progress2?.call(this, a, b, c, d);
+};
 
 Options.prototype.publish = function(value) {
 	var self = this;
@@ -252,7 +258,7 @@ Options.prototype.callback = Options.prototype.pipe = function(value) {
 		};
 	}
 
-	self.$callback(self.error.items.length ? self.error : null, value);
+	self.$callback.call(self, self.error.items.length ? self.error : null, value);
 };
 
 Options.prototype.done = function(arg) {
@@ -1348,6 +1354,11 @@ ActionCaller.prototype.status = function(fn) {
 	return this;
 };
 
+ActionCaller.prototype.progress = function(fn) {
+	this.options.progress = fn;
+	return this;
+};
+
 ActionCaller.prototype.exec = function() {
 
 	let self = this;
@@ -1394,6 +1405,7 @@ ActionCaller.prototype.exec = function() {
 	let type = meta.payload || (action.input ? '+' : '-');
 	let $ = self.$;
 
+	$.name = action.name;
 	$.id = action.id;
 	$.error = self.error;
 	$.controller = self.controller;
@@ -1497,7 +1509,10 @@ ActionCaller.prototype.exec = function() {
 		$.payload = payload;
 
 	if (self.options.status)
-		$.status = self.options.status;
+		$.status2 = self.options.status;
+
+	if (self.options.progress)
+		$.progress2 = self.options.progress;
 
 	if (action.middleware) {
 		action.middleware.wait(function(name, next) {
@@ -1523,9 +1538,9 @@ ActionCaller.prototype.finish = function(value) {
 			if (self.error.length)
 				$.invalid(self.error);
 			else
-				$.callback(value === undefined ? self.$.response : value);
+				$.callback.call(self.$, value === undefined ? self.$.response : value);
 		} else
-			self.options.callback(self.error.length ? self.error : null, value === undefined ? self.$.response : value);
+			self.options.callback.call(self.$, self.error.length ? self.error : null, value === undefined ? self.$.response : value);
 
 		self.options.callback = null;
 	}

package/changelog.txt

@@ -15,6 +15,9 @@
 - exended `Total.download()` by adding `size {Number}` property to the response
 - extended FlowStream by adding the ability to execute Total.js actions
 - added a new global event `ON('flowstream', function(instance) {`
+- added new action methods `$.progress(percentage)` and `ACTION().progress(console.log)` to measure percentage
+- fixed Total error handling
+- improved compiling navigation in the CMS compiler
 
 ========================
 0.0.15

package/cms.js

@@ -575,14 +575,30 @@ exports.compile = function(html, widgets, used) {
 		let endindex = html.indexOf('</script>', index);
 		let endhead = html.indexOf('>', index);
 		let head = html.substring(begindex, endhead);
-		let name = head.match(/name=".*?"/i)[0];
+		let uid = head.match(/id=".*?"/i);
 		let template = html.substring(html.indexOf('>', endhead) + 1, endindex);
+		let name = '';
 
-		name = name.substring(6, name.length - 1);
-		html = html.replace(html.substring(begindex, endindex + 9), '~WIDGET#' + response.tangular.length + '~');
-		response.tangular.push({ id: HASH(name).toString(36), name: name, type: 'nav', template: Tangular.compile(template) });
-		index = begindex;
+		if (uid && uid[0]) {
+			uid = uid[0];
+			uid = uid.substring(4, uid.length - 1);
+			name = uid.capitalize();
+		} else {
+			uid = head.match(/name=".*?"/i);
+			if (uid && uid[0]) {
+				uid = uid[0];
+				uid = uid.substring(6, uid.length - 1);
+				name = uid.capitalize();
+				uid = HASH(uid).toString(36); // Backward compatibility with old CMS
+			}
+		}
+
+		if (name) {
+			html = html.replace(html.substring(begindex, endindex + 9), '~WIDGET#' + response.tangular.length + '~');
+			response.tangular.push({ id: uid, name: name, type: 'nav', template: Tangular.compile(template) });
+		}
 
+		index = begindex;
 	}
 
 	index = 0;

package/index.js

@@ -500,7 +500,7 @@ function unlink(arr, callback) {
 
 		if (err instanceof F.TBuilders.ErrorBuilder) {
 			if (!name)
-				name = err[0].name;
+				name = err.items[0].name;
 		} else if (!name && err.name)
 			name = err.name;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.16-3",
+  "version": "0.0.16-4",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {