Fix U.parseInt().

petersirka · petersirka · commit 02ca1757b02a · 2017-01-28T15:32:09.000+01:00
diff --git a/test/test-utils.js b/test/test-utils.js
@@ -165,6 +165,9 @@ function prototypeString() {
 	str = '   a  ';
 	assert.ok(str.parseInt() === 0, 'string.parseInt(): ' + str);
 
+	str = '   a  ';
+	assert.ok(str.parseInt(-1) === -1, 'string.parseInt(): ' + str + ' / default');
+
 	str = '';
 	assert.ok(str.parseInt() === 0, 'string.parseInt(): ' + str);
 
@@ -447,15 +450,6 @@ function other() {
 	str = '.xFx';
 	assert.ok(utils.getContentType(str) === 'application/octet-stream', 'utils.getContentType(): ' + str);
 
-	str = 'logo.jpg';
-	assert.ok(utils.etag(str) === '800', 'utils.etag(): ' + str);
-
-	str = 'logo.jpg?=1';
-	assert.ok(utils.etag(str) === '973', 'utils.etag(): ' + str);
-
-	str = 'logo.jpg?=2';
-	assert.ok(utils.etag(str) === '974', 'utils.etag(): ' + str);
-
 	str = '/logo';
 	assert.ok(utils.path(str) === '/logo/', 'utils.path(): ' + str);
 
diff --git a/utils.js b/utils.js
@@ -1507,23 +1507,14 @@ exports.parseInt = function(obj, def) {
 	if (obj == null)
 		return def || 0;
 	var type = typeof(obj);
-	return type === 'number' ? obj : (type !== 'string' ? obj.toString() : obj).parseInt();
+	return type === 'number' ? obj : (type !== 'string' ? obj.toString() : obj).parseInt(def);
 };
 
 exports.parseBool = exports.parseBoolean = function(obj, def) {
-
 	if (obj == null)
 		return def === undefined ? false : def;
-
 	var type = typeof(obj);
-	if (type === 'boolean')
-		return obj;
-
-	if (type === 'number')
-		return obj > 0;
-
-	var str = type !== 'string' ? obj.toString() : obj;
-	return str.parseBool(def);
+	return type === 'boolean' ? obj : type === 'number' ? obj > 0 : (type !== 'string' ? obj.toString() : obj).parseBool(def);
 };
 
 /**
@@ -1533,16 +1524,10 @@ exports.parseBool = exports.parseBoolean = function(obj, def) {
  * @return {Number}
  */
 exports.parseFloat = function(obj, def) {
-
 	if (obj == null)
 		return def || 0;
-
 	var type = typeof(obj);
-	if (type === 'number')
-		return obj;
-
-	var str = type !== 'string' ? obj.toString() : obj;
-	return str.parseFloat(def);
+	return type === 'number' ? obj : (type !== 'string' ? obj.toString() : obj).parseFloat(def);
 };
 
 /**
