terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Support relative urls on Link component (#614)

Browse source 
* link: support relative urls

* link: support protocol-relative urls

* router: fix error for clicking anchor tag
This commit is contained in:
Naoyuki Kanezawa 2017-01-02 15:22:07 +09:00 committed by Guillermo Rauch
parent 0cce0962d2
commit c1a620a7c4
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/link.js
View file

@ -1,3 +1,4 @@
import { resolve } from 'url'
import React, { Component, Children, PropTypes } from 'react' import React, { Component, Children, PropTypes } from 'react'
import Router from './router' import Router from './router'
@ -21,13 +22,17 @@ export default class Link extends Component {
return return
} }
const { href, as = href } = this.props let { href, as } = this.props
if (!isLocal(href)) { if (!isLocal(href)) {
// ignore click if it's outside our scope // ignore click if it's outside our scope
return return
} }
const { pathname } = window.location
href = resolve(pathname, href)
as = as ? resolve(pathname, as) : href
e.preventDefault() e.preventDefault()
// avoid scroll for urls with anchor refs // avoid scroll for urls with anchor refs
@ -74,6 +79,6 @@ export default class Link extends Component {
export function isLocal (href) { export function isLocal (href) {
const origin = window.location.origin const origin = window.location.origin
return !/^https?:\/\//.test(href) || return !/^(https?:)?\/\//.test(href) ||
origin === href.substr(0, origin.length) origin === href.substr(0, origin.length)
} }

2
lib/router/router.js
View file

@ -32,7 +32,7 @@ export default class Router extends EventEmitter {
async onPopState (e) { async onPopState (e) {
this.abortComponentLoad() this.abortComponentLoad()
const { url, as } = e.state const { url = getURL(), as = url } = e.state || {}
const { pathname, query } = parse(url, true) const { pathname, query } = parse(url, true)
if (!this.urlIsNew(pathname, query)) { if (!this.urlIsNew(pathname, query)) {