Skip to content

Handle relative URLs #138

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

Closed
ashsearle wants to merge 11 commits into from
Closed

Handle relative URLs #138

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
854cc48
Use classic array methods, and more es2015
ashsearle Jan 28, 2017
966a658
Merge remote-tracking branch 'upstream/master'
ashsearle Jan 29, 2017
9822495
Implement stable sort to fix #123
ashsearle Feb 1, 2017
cbeeeeb
Merge remote-tracking branch 'upstream/master'
ashsearle Feb 1, 2017
ffd8cc5
Use named function for rank callback
ashsearle Feb 5, 2017
3cf318c
Ignore text children of Router
ashsearle Feb 5, 2017
3dc6fa5
#129: Handle relative URLs
ashsearle Feb 5, 2017
add0f95
Merge remote-tracking branch 'upstream/master'
ashsearle Feb 24, 2017
3967336
Merge branch 'master' into relative-paths
ashsearle Feb 24, 2017
f17db8a
Use <a> for URL resolution
ashsearle Feb 24, 2017
7902c56
Merge branch 'master' into relative-paths
developit Apr 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 46 additions & 12 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,61 @@ function setUrl(url, type='push') {
}


function getCurrentLocation() {
return (customHistory && customHistory.location) ||
Copy link
Member

@developit developit Feb 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implementation is good, but if it's only ever called from getCurrentUrl(), let's just inline it there.

Copy link
Contributor Author

@ashsearle ashsearle Feb 6, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's also called from the new resolve method used by route.

I was wondering whether to tweak resolve to take a base parameter as well, then move it to util.js and add test-cases.

Copy link
Member

@developit developit Feb 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depends - there was talk about moving customHistory to be a property of Router instances so that they had proper instance separation instead of the singleton stuff. Might be better to go that route rather than making it more singelton-ey? Different PR I guess though.

(customHistory && customHistory.getCurrentLocation && customHistory.getCurrentLocation()) ||
(typeof location!=='undefined' ? location : EMPTY);
}

function getCurrentUrl() {
let url;
if (customHistory && customHistory.location) {
url = customHistory.location;
}
else if (customHistory && customHistory.getCurrentLocation) {
url = customHistory.getCurrentLocation();
}
else {
url = typeof location!=='undefined' ? location : EMPTY;
}
let url = getCurrentLocation();
return `${url.pathname || ''}${url.search || ''}`;
}


// Lifted from https://tools.ietf.org/html/rfc3986#appendix-B
const uriRegex = new RegExp('^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?');

/* Resolve URL relative to current location */
function resolve(url) {
let current = getCurrentLocation();
let [,
protocol,,
,hostname,
pathname,
search,,
// hash,,
] = uriRegex.exec(url);
if (
(protocol && protocol !== current.protocol) ||
(hostname && hostname !== current.hostname)
) {
return;
}
if (pathname.charAt(0) !== '/') {
let stack = (current.pathname||'/').split("/"),
segments = pathname.split("/");
stack.pop();
for (let i=0; i<segments.length; i++) {
if (segments[i] === "..")
stack.pop();
else if (segments[i] !== ".")
stack.push(segments[i]);
}
pathname = stack.join("/");
}
return `${pathname}${search || ''}`;
}

function route(url, replace=false) {
if (typeof url!=='string' && url.url) {
replace = url.replace;
url = url.url;
}

url = resolve(url);
if (!url) return;

// only push URL into history if we can handle it
if (canRoute(url)) {
setUrl(url, replace ? 'replace' : 'push');
Expand Down Expand Up @@ -83,8 +117,8 @@ function routeFromLink(node) {
let href = node.getAttribute('href'),
target = node.getAttribute('target');

// ignore links with targets and non-path URLs
if (!href || !href.match(/^\//g) || (target && !target.match(/^_?self$/i))) return;
// ignore links with targets
if (!href || (target && !target.match(/^_?self$/i))) return;

// attempt to route, if no match simply cede control to browser
return route(href);
Expand Down