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.

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

Show OutboundLink icon for external links #428

Merged
merged 4 commits into from
May 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions lib/app/app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Vue from 'vue'
import Router from 'vue-router'
import Content from './Content'
import OutboundLink from '../default-theme/OutboundLink.vue'
import ClientOnly from './ClientOnly'
import dataMixin from './dataMixin'
import store from './store'
Expand Down Expand Up @@ -28,6 +29,7 @@ Vue.use(Router)
Vue.mixin(dataMixin)
// component for rendering markdown content and setting title etc.
Vue.component('Content', Content)
Vue.component('OutboundLink', OutboundLink)
// component for client-only content
Vue.component('ClientOnly', ClientOnly)

Expand Down
7 changes: 5 additions & 2 deletions lib/default-theme/NavLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
<a
v-else
:href="link"
class="nav-link"
class="nav-link external"
:target="isMailto(link) || isTel(link) ? null : '_blank'"
:rel="isMailto(link) || isTel(link) ? null : 'noopener noreferrer'"
>{{ item.text }}</a>
>
{{ item.text }}
<OutboundLink/>
</a>
</template>

<script>
Expand Down
5 changes: 2 additions & 3 deletions lib/default-theme/NavLinks.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
</template>

<script>
import OutboundLink from './OutboundLink.vue'
import DropdownLink from './DropdownLink.vue'
import { resolveNavLinkItem } from './util'
import NavLink from './NavLink.vue'

export default {
components: { OutboundLink, NavLink, DropdownLink },
components: { NavLink, DropdownLink },
computed: {
userNav () {
return this.$themeLocaleConfig.nav || this.$site.themeConfig.nav || []
Expand Down Expand Up @@ -126,7 +125,7 @@ export default {
.nav-links a
&:hover, &.router-link-active
color $textColor
.nav-item > a
.nav-item > a:not(.external)
&:hover, &.router-link-active
margin-bottom -2px
border-bottom 2px solid lighten($accentColor, 8%)
Expand Down
2 changes: 0 additions & 2 deletions lib/default-theme/Page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@
</template>

<script>
import OutboundLink from './OutboundLink.vue'
import { resolvePage, normalize, outboundRE, endingSlashRE } from './util'

export default {
components: { OutboundLink },
props: ['sidebarItems'],
computed: {
lastUpdated () {
Expand Down
17 changes: 7 additions & 10 deletions lib/markdown/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ module.exports = (md, externalAttrs) => {
const isSourceLink = /(\/|\.md|\.html)(#.*)?$/.test(href)
if (isExternal) {
Object.entries(externalAttrs).forEach(([key, val]) => {
addAttr(token, key, val)
token.attrSet(key, val)
})

if (/_blank/i.test(externalAttrs['target'])) {
// add OutBoundLink to content if it opens in _blank
tokens[idx + 1].type = 'html_block'
tokens[idx + 1].content += '<OutboundLink/>'
}
} else if (isSourceLink) {
hasOpenRouterLink = true
tokens[idx] = toRouterLink(token, link)
Expand Down Expand Up @@ -56,12 +62,3 @@ module.exports = (md, externalAttrs) => {
return self.renderToken(tokens, idx, options)
}
}

function addAttr (token, name, val) {
const targetIndex = token.attrIndex(name)
if (targetIndex < 0) {
token.attrPush([name, val])
} else {
token.attrs[targetIndex][1] = val
}
}