Merge pull request totaljs#512 from totaljs/v2.6.1

petersirka · web-flow · commit e73dcd6dc064 · 2017-06-05T09:09:14.000+02:00
v2.6.1
diff --git a/changes.txt b/changes.txt
@@ -1,3 +1,8 @@
+======= 2.6.1 (HOTFIX)
+
+- fixed: timeout in `RESTBuilder` and `U.request()`
+- fixed: `F.merge()` a problem with `.js` or `.css` extension in some directory
+
 ======= 2.6.0
 
 - added: `F.config['default-errorbuilder-status']` a default HTTP status for all error builders default `200`
diff --git a/debug.js b/debug.js
@@ -17,7 +17,6 @@ module.exports = function(opt) {
 };
 
 process.on('uncaughtException', e => e.toString().indexOf('ESRCH') == -1 && console.log(e));
-
 process.title = 'total: debug';
 
 function runapp() {
diff --git a/index.js b/index.js
@@ -21,7 +21,7 @@
 
 /**
  * @module Framework
- * @version 2.6.0
+ * @version 2.6.1
  */
 
 'use strict';
@@ -500,8 +500,8 @@ const controller_error_status = function(controller, status, problem) {
 function Framework() {
 
 	this.$id = null; // F.id ==> property
-	this.version = 2600;
-	this.version_header = '2.6.0';
+	this.version = 2610;
+	this.version_header = '2.6.1';
 	this.version_node = process.version.toString().replace('v', '').replace(/\./g, '').parseFloat();
 
 	this.config = {
@@ -2058,13 +2058,13 @@ F.merge = function(url) {
 		url = '/' + url;
 
 	var filename = F.path.temp((F.id ? 'i-' + F.id + '_' : '') + 'merged_' + createTemporaryKey(url));
-	F.routes.merge[url] = { filename: filename.replace(/\.(js|css)/g, ext => '.min' + ext), files: arr };
+	F.routes.merge[url] = { filename: filename.replace(/\.(js|css)$/g, ext => '.min' + ext), files: arr };
 	Fs.unlink(F.routes.merge[url].filename, NOOP);
 	F.owners.push({ type: 'merge', owner: _owner, id: url });
 	return F;
 };
 
-F.mapping = function(url, path) {
+F.mapping = function() {
 	return F.map.apply(F, arguments);
 };
 
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
         "name": "Peter Štolc",
         "email": "stolcp@gmail.com"
     }],
-    "version": "2.6.0",
+    "version": "2.6.1",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
diff --git a/readme.md b/readme.md
@@ -14,6 +14,7 @@ $ npm install -g total.js
 [![Support](https://www.totaljs.com/img/button-support.png?v=3)](https://www.totaljs.com/support/)
 
 - [Total.js Flow](https://www.totaljs.com/flow/)
+- [Total.js Flowboard](https://www.totaljs.com/flowboard/)
 - [Total.js Messenger](https://www.totaljs.com/messenger/)
 - [Total.js Dashboard](https://www.totaljs.com/dashboard/)
 - [Total.js BlogEngine](https://www.totaljs.com/blogengine/)
diff --git a/utils.js b/utils.js
@@ -411,7 +411,7 @@ exports.keywords = function(content, forSearch, alternative, max_count, max_leng
  * @param  {Number} timeout Request timeout.
  * return {Boolean}
  */
-exports.request = function(url, flags, data, callback, cookies, headers, encoding) {
+exports.request = function(url, flags, data, callback, cookies, headers, encoding, timeout) {
 
 	// No data (data is optional argument)
 	if (typeof(data) === 'function') {
@@ -426,7 +426,7 @@ exports.request = function(url, flags, data, callback, cookies, headers, encodin
 	if (callback === NOOP)
 		callback = null;
 
-	var options = { length: 0, timeout: 10000, evt: new EventEmitter2(), encoding: typeof(encoding) !== 'string' ? ENCODING : encoding, callback: callback, post: false, redirect: 0 };
+	var options = { length: 0, timeout: timeout || 10000, evt: new EventEmitter2(), encoding: typeof(encoding) !== 'string' ? ENCODING : encoding, callback: callback, post: false, redirect: 0 };
 	var method;
 	var type = 0;
 
