Skip to content

Commit 6ccfec2

Browse files
committed
Update U.getExtension() returns lower-case extensions.
1 parent c07c874 commit 6ccfec2

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

changes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- updated: `F.backup()` argument `path` can contain `String Array` file list
1010
- updated: `controller.viewCompile(body, model, [headers], [partial], [cacheKey])` add a cache key
1111
- updated: `image.command(arg, value, [priority], [escape])` a `priority` argument can be `escape` when it contains `boolean` value
12+
- updated: `U.getExtension()` returns lower-case extensions
1213

1314
- fixed: mail auth when `options.user` and `options.password` are blank
1415

index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2250,7 +2250,7 @@ F.map = function(url, filename, filter) {
22502250
if (!filter(file))
22512251
continue;
22522252
} else {
2253-
if (filter.indexOf(U.getExtension(file).toLowerCase()) === -1)
2253+
if (filter.indexOf(U.getExtension(file)) === -1)
22542254
continue;
22552255
}
22562256
}
@@ -3029,7 +3029,7 @@ F.$load = function(types, targetdirectory, callback, packageName) {
30293029
return;
30303030
}
30313031

3032-
var ext = U.getExtension(o).toLowerCase();
3032+
var ext = U.getExtension(o);
30333033
if (ext)
30343034
ext = '.' + ext;
30353035
if (ext !== extension)
@@ -3195,7 +3195,7 @@ F.$startup = function(callback) {
31953195
var run = [];
31963196

31973197
Fs.readdirSync(dir).forEach(function(o) {
3198-
var extension = U.getExtension(o).toLowerCase();
3198+
var extension = U.getExtension(o);
31993199
if (extension === 'js')
32003200
run.push(o);
32013201
});

utils.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1794,14 +1794,16 @@ exports.getContentType = function(ext) {
17941794
* @param {String} filename
17951795
* @return {String}
17961796
*/
1797-
exports.getExtension = function(filename) {
1797+
exports.getExtension = function(filename, raw) {
17981798
var end = filename.length;
17991799
for (var i = filename.length; i > 1; i--) {
18001800
var c = filename[i];
18011801
if (c === ' ' || c === '?')
18021802
end = i;
1803-
else if (c === '.')
1804-
return filename.substring(i + 1, end);
1803+
else if (c === '.') {
1804+
c = filename.substring(i + 1, end);
1805+
return raw ? c : c.toLowerCase();
1806+
}
18051807
else if (c === '/')
18061808
return '';
18071809
}

0 commit comments

Comments
 (0)