Skip to content

Commit

Permalink
Merge pull request #734 from carloslancha/issue-733-item-href
Browse files Browse the repository at this point in the history
Check if item href is not null for quick items in management toolbar | Fixes #733
  • Loading branch information
jbalsas authored Mar 14, 2018
2 parents 369bc63 + c2ebcab commit 122974c
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<nav class="management-bar management-bar-primary navbar navbar-expand-md navbar-nowrap"><div class="container"><ul class="navbar-nav navbar-nav-expand"><li class="nav-item"><div class="custom-control custom-checkbox"><label><input checked="checked"class="custom-control-input"ref="input" type="checkbox" /><span class="custom-control-label"><span class="custom-control-label-text sr-only">Select Page</span></span></label></div></li><li class="nav-item"><span class="navbar-text">1 of 3 <span class="navbar-breakpoint-down-d-none">items selected</span></span></li><li class="nav-item nav-item-shrink"><button class="btn nav-btn btn-link"aria-label="Select all"type="null">Select all</button></li></ul><ul class="navbar-nav"><li class="nav-item"><div class="dropdown dropdown-action"><button aria-expanded="false"aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn nav-link nav-link-monospaced btn-unstyled"data-onclick="toggle"type="button"><svg aria-hidden="true" class="lexicon-icon lexicon-icon-ellipsis-v"focusable="false"><title>ellipsis-v</title><use xlink:href="spritemap.svg#ellipsis-v" /></svg></button><div class="dropdown-menu" ref="menu"><ul class="list-unstyled"></ul></div></div></li></ul></div></nav>
<nav class="management-bar management-bar-primary navbar navbar-expand-md navbar-nowrap"><div class="container"><ul class="navbar-nav navbar-nav-expand"><li class="nav-item"><div class="custom-control custom-checkbox"><label><input checked="checked"class="custom-control-input"ref="input" type="checkbox" /><span class="custom-control-label"><span class="custom-control-label-text sr-only">Select Page</span></span></label></div></li><li class="nav-item"><span class="navbar-text">1 of 3 <span class="navbar-breakpoint-down-d-none">items selected</span></span></li><li class="nav-item nav-item-shrink"><button class="btn nav-btn btn-link"aria-label="Select all"type="null">Select all</button></li></ul><ul class="navbar-nav"><li class="nav-item navbar-breakpoint-down-d-none" data-onclick="null"><button class="btn nav-link nav-link-monospaced quick-action-item btn-unstyled"aria-label="icon"type="null"><svg aria-hidden="true" class="lexicon-icon lexicon-icon-icon"focusable="false"><title>icon</title><use xlink:href="spritemap.svg#icon" /></svg></button></li><li class="nav-item navbar-breakpoint-down-d-none" data-onclick="null"><button class="btn nav-link nav-link-monospaced quick-action-item btn-unstyled"aria-label="icon"type="null"><svg aria-hidden="true" class="lexicon-icon lexicon-icon-icon"focusable="false"><title>icon</title><use xlink:href="spritemap.svg#icon" /></svg></button></li><li class="nav-item"><div class="dropdown dropdown-action"><button aria-expanded="false"aria-haspopup="true" aria-label="toggle" class="dropdown-toggle btn nav-link nav-link-monospaced btn-unstyled"data-onclick="toggle"type="button"><svg aria-hidden="true" class="lexicon-icon lexicon-icon-ellipsis-v"focusable="false"><title>ellipsis-v</title><use xlink:href="spritemap.svg#ellipsis-v" /></svg></button><div class="dropdown-menu" ref="menu"><ul class="list-unstyled"><li data-onclick="null"><a class=" dropdown-item">action 1</a></li><li data-onclick="null"><a class=" dropdown-item">action 2</a></li><li data-onclick="null"><a class=" dropdown-item"></a></li><li data-onclick="null"><a class=" dropdown-item"></a></li><li data-onclick="null"><a class=" dropdown-item">action 5</a></li><li data-onclick="null"><a class=" dropdown-item">action 6</a></li></ul></div></div></li></ul></div></nav>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,29 @@
"spritemap": "spritemap.svg",
"totalItems": 3,
"actionItems": [

{
"label": "action 1",
},
{
"label": "action 2",
"quickAction": true,
},
{
"icon": "icon",
},
{
"icon": "icon",
"quickAction": true,
},
{
"icon": "icon",
"label": "action 5",
},
{
"icon": "icon",
"label": "action 6",
"quickAction": true
}
],
"handleActionClicked_": "",
"elementClasses": "clay-management-toolbar-1 clay-management-toolbar-2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@
{foreach $item in $actionItems}
{if $item.quickAction and $item.icon and $spritemap}
<li class="nav-item navbar-breakpoint-down-d-none" data-onclick="{$_handleQuickActionClicked}">
{if $item.href}
{if isNonnull($item.href)}
{call ClayLink.render}
{param elementClasses: 'quick-action-item' /}
{param href: $item.href /}
Expand Down

0 comments on commit 122974c

Please sign in to comment.