total5 0.0.1-33 → 0.0.1-35

package/controller.js

@@ -397,6 +397,11 @@ Controller.prototype.fallback = function(code, err) {
 	}
 };
 
+Controller.prototype.layout = function(name) {
+	var ctrl = this;
+	ctrl.response.layout = name;
+};
+
 Controller.prototype.view = function(name, model) {
 
 	var ctrl = this;
@@ -405,6 +410,7 @@ Controller.prototype.view = function(name, model) {
 		return;
 
 	var view = new F.TViewEngine.View(ctrl);
+	ctrl.response.layout && view.layout(ctrl.response.layout);
 	var output = view.render(name, model);
 	ctrl.html(output);
 };
@@ -1039,7 +1045,7 @@ function authorize(ctrl) {
 		execute(ctrl);
 }
 
-function execute(ctrl) {
+function execute(ctrl, skipmiddleware) {
 
 	ctrl.timeout = ctrl.route.timeout || F.config.$httptimeout;
 
@@ -1053,7 +1059,7 @@ function execute(ctrl) {
 		ctrl.uri.cache += ctrl.language;
 	}
 
-	if (ctrl.route.middleware.length) {
+	if (!skipmiddleware && ctrl.route.middleware.length) {
 		middleware(ctrl);
 	} else {
 
@@ -1403,7 +1409,7 @@ function middleware(ctrl) {
 			else
 				run(index + 1);
 		} else
-			ctrl.route.action(ctrl);
+			execute(ctrl, true);
 	};
 	run(0);
 }

package/cron.js

@@ -28,7 +28,7 @@ function cronexec(output, date) {
 				break;
 			}
 		} else if (m.type === 'every') {
-			if (m.value % val !== 0) {
+			if (m.value[i] !== '*' && m.value[i] % val !== 0) {
 				is = false;
 				break;
 			}

package/flow-flowstream.js

@@ -799,7 +799,7 @@ function send(self, id, data, callback) {
 	} else if (id[0] === '#') {
 		id = id.substring(1);
 		for (let key in instances) {
-			if (instances[key].module && instances[key].module.id === id) {
+			if (instances[key].module.name === id) {
 				instance = instances[key];
 				break;
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.1-33",
+  "version": "0.0.1-35",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/routing.js

@@ -58,10 +58,10 @@ function Route(url, action, size) {
 
 	if (url[0] === '#') {
 		// internal routing
-		t.url = [url[0].substring(1)];
+		t.url = [url.substring(1)];
 		t.action = action;
 		t.fallback = true;
-		F.routes.fallback[t.url[0]] = t;
+		F.routes.fallback[t.url] = t;
 		return;
 	}