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

[SDPA-2723] Add link target="" support to components that display menus. #384

Merged
merged 2 commits into from
Aug 14, 2019
Merged

[SDPA-2723] Add link target="" support to components that display menus. #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4dced7
Add link target="" support to components that display menus.
alan-cole Jun 5, 2019
42d6643
Merge branch 'develop' into feature/external-link
alan-cole Aug 14, 2019
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
6 changes: 4 additions & 2 deletions packages/components/Atoms/Global/mixins/parentlinks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ const parentlinks = {
return branch.map(item => {
let newitem = {
text: item.text,
url: item.url
url: item.url,
target: item.target
}
if (item.children) {
newitem.children = this.generateParentLinks(item.children)
newitem.children.unshift({
text: item.text,
url: item.url
url: item.url,
target: item.target
})
}
return newitem
Expand Down
2 changes: 1 addition & 1 deletion packages/components/Molecules/Sitemap/SitemapMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<ul class="rpl-sitemap-menu__list" :class="'rpl-sitemap-menu__list--depth-' + depth">
<li class="rpl-sitemap-menu__list-item" v-for="(list, index) in menu" :key="index">
<rpl-link class="rpl-sitemap-menu__link" :class="'rpl-sitemap-menu__link--depth-' + depth" :href="list.url">{{ list.text }}</rpl-link>
<rpl-link class="rpl-sitemap-menu__link" :class="'rpl-sitemap-menu__link--depth-' + depth" :href="list.url" :target="list.target">{{ list.text }}</rpl-link>
<rpl-sitemap-menu v-if="list.children" :menu="list.children" :depth="depth + 1"></rpl-sitemap-menu>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions packages/components/Organisms/SiteFooter/FooterNavigation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<template v-for="(item, index) in nav">
<li class="rpl-footer-nav__menu-item" :class="{'rpl-footer-nav__menu-item--parent': item.children}" :key="index" >
<h2 class="rpl-footer-nav__heading" @click="toggle(item, index, $event)">
<rpl-link :href="item.url">{{ item.text }}</rpl-link>
<rpl-link :href="item.url" :target="item.target">{{ item.text }}</rpl-link>
<rpl-icon :symbol="visibleItemIndex == index ? 'up' : 'down'" color="secondary" size="m" v-if="(minimize && item.children)" />
</h2>
<transition name="rpl-accordion">
<ul class="rpl-footer-nav__submenu-item" v-if="item.children" v-show="(!minimize || visibleItemIndex == index)">
<li v-for="(child, cIndex) in item.children" :key="cIndex">
<rpl-link :href="child.url">{{ child.text }}</rpl-link>
<rpl-link :href="child.url" :target="child.target">{{ child.text }}</rpl-link>
</li>
</ul>
</transition>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/Organisms/SiteFooter/LinksAndCopyright.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="rpl-links-and-copyright">
<ul class="rpl-links-and-copyright__links">
<li v-for="(link, index) in links" :key="index">
<rpl-link :href="link.url">{{ link.text }}</rpl-link>
<rpl-link :href="link.url" :target="link.target">{{ link.text }}</rpl-link>
</li>
</ul>
<div class="rpl-links-and-copyright__copyright" v-html="copyright">
Expand Down
5 changes: 3 additions & 2 deletions packages/components/Organisms/SiteHeader/menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<rpl-icon symbol="left" color="white" />
<span class="rpl-visually-hidden">Close {{ title }} and return to </span><span>{{ backTitle }}</span>
</button>
<rpl-link v-if="showMenuHeading && parent" class="rpl-menu__heading" :class="{ 'rpl-menu__heading--horizontal-sub' : (!isVerticalLayout && depth > 1) }" :href="parent.url">{{ parent.text }}</rpl-link>
<rpl-link v-if="showMenuHeading && parent" class="rpl-menu__heading" :class="{ 'rpl-menu__heading--horizontal-sub' : (!isVerticalLayout && depth > 1) }" :href="parent.url" :target="parent.target">{{ parent.text }}</rpl-link>
</div>
<ul class="rpl-menu__items" :class="{ 'rpl-menu__items--root': isRoot }">
<li
Expand All @@ -44,6 +44,7 @@
v-if="!list.children"
class="rpl-menu__item-link"
:href="list.url"
:target="list.target"
@focus="onItemFocus"
>
{{ list.text }}
Expand Down Expand Up @@ -533,7 +534,7 @@ export default {

.rpl-menu--vertical,
.rpl-menu--horizontal-floating-wrapper,
.rpl-menu--horizontal .rpl-menu--subs, {
.rpl-menu--horizontal .rpl-menu--subs {
.rpl-menu__item {
border-top: $rpl-menu-item-border;

Expand Down
2 changes: 1 addition & 1 deletion packages/components/Organisms/SiteSectionNavigation/menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<transition name="section" @enter="start" @after-enter="end" @before-leave="start" @after-leave="end">
<ul v-show="open" :data-depth="depth" class="rpl-section-menu">
<li v-for="(link, index) in menu" :key="index" class="rpl-section-menu__item rpl-section-menu__item--parent" :class="{'rpl-section-menu__item--active': menuItemOpen[index]}">
<rpl-link v-if="!link.children" :href="link.url" class="rpl-section-menu__item-link">{{ link.text }}</rpl-link>
<rpl-link v-if="!link.children" :href="link.url" :target="link.target" class="rpl-section-menu__item-link">{{ link.text }}</rpl-link>
<button
v-else
class="rpl-section-menu__item-link rpl-section-menu__item-link--parent"
Expand Down