Fix regex for file extension match.

websanova · websanova · commit 13a3d2725c8a · 2018-04-05T19:05:31.000+07:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-url",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "A simple, lightweight url parser for JavaScript (~1.7 Kb minified, ~0.7Kb gzipped).",
   "main": "url.js",
   "repository": {
diff --git a/tests.js b/tests.js
@@ -176,6 +176,12 @@ test('file', function() {
   deepEqual( window.url( 'file', 'http://domain.com' ), undefined );
   deepEqual( window.url( 'filename', 'http://domain.com' ), undefined );
   deepEqual( window.url( 'fileext', 'http://domain.com' ), undefined );
+  deepEqual( window.url( 'file', 'http://domain.com/some.file.png' ), 'some.file.png' );
+  deepEqual( window.url( 'filename', 'http://domain.com/some.file.png' ), 'some.file' );
+  deepEqual( window.url( 'fileext', 'http://domain.com/some.file.png' ), 'png' );
+  deepEqual( window.url( 'file', 'http://domain.com/.png' ), '.png' );
+  deepEqual( window.url( 'filename', 'http://domain.com/.png' ), '' );
+  deepEqual( window.url( 'fileext', 'http://domain.com/.png' ), 'png' );
 });
 
 test('url parts', function() {
diff --git a/url-tld.min.js b/url-tld.min.js
diff --git a/url.jquery.json b/url.jquery.json
@@ -6,7 +6,7 @@
     "websanova",
     "url"
   ],
-  "version": "2.5.2",
+  "version": "2.5.3",
   "author": {
     "name": "Websanova",
     "email": "rob@websanova.com",
diff --git a/url.js b/url.js
@@ -123,7 +123,7 @@
                 // File.
                 tmp = _i('/-1', _l.path.substring(1));
 
-                if (tmp && (tmp = tmp.match(/(.*?)\.(.*)/))) {
+                if (tmp && (tmp = tmp.match(/(.*?)\.([^.]+)$/))) {
                     _l.file = tmp[0];
                     _l.filename = tmp[1];
                     _l.fileext = tmp[2];
diff --git a/url.min.js b/url.min.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "js-url",`
`3`		`- "version": "2.5.2",`
	`3`	`+ "version": "2.5.3",`
`4`	`4`	`"description": "A simple, lightweight url parser for JavaScript (~1.7 Kb minified, ~0.7Kb gzipped).",`
`5`	`5`	`"main": "url.js",`
`6`	`6`	`"repository": {`