Skip to content

Commit

Permalink
Fixes liferay#1268 - SF
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Lancha authored and bryceosterhaus committed Nov 5, 2018
1 parent 26aa2fc commit fe22795
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion packages/clay-dropdown/src/ClayDropdownItem.soy
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
{@param? separator: bool}
{@param? spritemap: string}
{@param? title: string}

{let $variant: $contentRenderer ?: 'item' /}

{delcall ClayDropdownItem.Item variant="$contentRenderer"}
{delcall ClayDropdownItem.Item variant="$variant"}
{param _handleItemClick: $_handleItemClick /}
{param active: $active /}
{param checked: $checked /}
Expand Down
2 changes: 1 addition & 1 deletion packages/clay-pagination/src/ClayPagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'clay-dropdown';
import 'clay-link';
import ClayComponent from 'clay-component';
// eslint-disable-next-line
import {ClayDropdownBase, ClayDropdownItem} from 'clay-dropdown';
import { ClayDropdownBase, ClayDropdownItem } from 'clay-dropdown';
import {Config} from 'metal-state';
import defineWebComponent from 'metal-web-component';
import Soy from 'metal-soy';
Expand Down
4 changes: 2 additions & 2 deletions packages/clay-pagination/src/ClayPagination.soy
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<li>
{call ClayDropdownBase.render}
{param _handleItemClick: $_handlePageClick /}
{param contentRenderer: 'paginationdropdownitems' /}
{param contentRenderer: 'pagination' /}
{param elementClasses: 'page-item' /}
{param items: [[
'initPage': $initPage,
Expand All @@ -221,7 +221,7 @@
/**
* Renders a dropdown list of items
*/
{deltemplate ClayDropdownBase.Content variant="'paginationdropdownitems'"}
{deltemplate ClayDropdownBase.Content variant="'pagination'"}
{@param? _handleItemClick: any}
{@param? contentRenderer: string}
{@param? items: list<?>}
Expand Down

0 comments on commit fe22795

Please sign in to comment.