Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use local version for isInteger rather than Number.isInteger (browser compatability) #351

Merged
merged 1 commit into from Aug 10, 2017
Merged

Use local version for isInteger rather than Number.isInteger (browser compatability) #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/URI.js
View file
Open in desktop
Expand Up @@ -77,6 +77,10 @@
return this;
}

function isInteger(value) {
return /^[0-9]+$/.test(value);
}

URI.version = '1.18.11';

var p = URI.prototype;
Expand Down Expand Up @@ -1058,7 +1062,7 @@
}

var port = Number(v);
if (Number.isInteger(port) && (port > 0) && (port < 65536)) {
if (isInteger(port) && (port > 0) && (port < 65536)) {
return;
}

Expand Down
30 changes: 30 additions & 0 deletions test/test.js
View file
Open in desktop
Expand Up @@ -1681,6 +1681,36 @@
deepEqual(links, expected, 'urls extracted');
equal(result, source, 'source not modified');
});
test('ensureValidPort', function() {

function testPort(value) {
var result = true;
try {
URI.ensureValidPort(value);
} catch(e) {
result = false;
}

return result;
}

equal(testPort(8000), true);
equal(testPort('8080'), true);

equal(testPort(0), true);
equal(testPort(1), true);

equal(testPort(65535), true);
equal(testPort(65536), false);

equal(testPort(-8080), false);
equal(testPort('-8080'), false);

equal(testPort('aaa8080'), false);
equal(testPort('8080a'), false);

equal(testPort(8080.2), false);
});
test('noConflict', function() {
var actual_lib = URI; // actual library; after loading, before noConflict()
var unconflicted = URI.noConflict();
Expand Down