Skip to content

fix bind-attr and action-on-focus deprecations #31

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

Open
Awem wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix bind-attr and action-on-focus deprecations #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions app/templates/components/list-picker.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
optionLabelPath=optionLabelPath
optionValuePath=optionValuePath}}

<div {{bind-attr class=":bs-select nativeMobile:hidden-xs disabled:disabled"}}>
<div class="bs-select {{if nativeMobile 'hidden-xs'}} {{if disabled 'disabled'}}">
{{#if liveSearch}}
<div class="input-group">
{{input type="text" class="search-filter form-control" value=searchFilter action="preventClosing" on="focus"}}
{{input type="text" class="search-filter form-control" value=searchFilter focus="preventClosing"}}
<span class="input-group-btn">
<button type="button"
class="btn btn-default list-picker-clear-filter"
{{bind-attr disabled=clearSearchDisabled}}
disabled={{clearSearchDisabled}}
{{action "clearFilter"}}>
<span class="glyphicon glyphicon-remove"></span>
</button>
Expand All @@ -36,7 +36,7 @@
<div role="group" class="btn-group-vertical btn-block">
<button type="button" class="btn btn-default" {{action "toggleSelectAllNone"}}>
{{selectAllNoneLabel}}
<span {{bind-attr class=":check-mark :glyphicon glyphiconClass"}}></span>
<span class="check-mark glyphicon {{glyphiconClass}}"></span>
</button>
</div>
{{/if}}
Expand All @@ -49,9 +49,9 @@
{{#each group.items as |item|}}
<button role="presentation"
{{action "selectItem" item}}
{{bind-attr class=":btn :btn-default item.selected:active"}}>
class="btn btn-default {{if item.selected 'active'}}">
{{item.label}}
<span {{bind-attr class=":glyphicon :glyphicon-ok :check-mark item.selected::invisible"}}></span>
<span class="glyphicon glyphicon-ok check-mark {{if item.selected '' 'invisible'}}"></span>
</button>
{{/each}}
</div>
Expand Down
20 changes: 10 additions & 10 deletions app/templates/components/select-picker.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@
optionLabelPath=optionLabelPath
optionValuePath=optionValuePath}}

<div {{bind-attr class=":bs-select :dropdown nativeMobile:hidden-xs disabled:disabled showDropdown:open"}}>
<div class="bs-select dropdown {{if nativeMobile 'hidden-xs'}} {{if disabled 'disabled'}} {{if showDropdown 'open'}}">
<button type="button"
{{bind-attr class=":btn :dropdown-toggle buttonClass"}}
{{bind-attr id=menuButtonId}}
{{bind-attr disabled=disabled}}
class="btn dropdown-toggle {{buttonClass}}"
id={{menuButtonId}}
disabled={{disabled}}
{{action "showHide"}}
aria-expanded="true">
<span class="pull-left">
{{selectionSummary}}
<span {{bind-attr class="selectionBadge:badge:caret"}}>{{selectionBadge}}</span>
<span class="{{if selectionBadge 'badge' 'caret'}}">{{selectionBadge}}</span>
</span>
</button>
<ul class="dropdown-menu" role="menu" {{bind-attr aria-labelledby=menuButtonId}}>
<ul class="dropdown-menu" role="menu" aria-labelledby={{menuButtonId}}>
{{#if liveSearch}}
<li>
{{input type="text" class="search-filter form-control" value=searchFilter action="preventClosing" on="focus"}}
{{input type="text" class="search-filter form-control" value=searchFilter focus="preventClosing"}}
</li>
{{/if}}
{{#if multiple}}
Expand All @@ -40,7 +40,7 @@
{{else}}
<button type="button" class="btn btn-default btn-xs btn-block" {{action "toggleSelectAllNone"}}>
{{selectAllNoneLabel}}
<span {{bind-attr class=":check-mark :glyphicon glyphiconClass"}}></span>
<span class="check-mark glyphicon {{glyphiconClass}}"></span>
</button>
{{/if}}
</li>
Expand All @@ -50,10 +50,10 @@
{{#unless item.first}}<li class="divider" role="presentation"></li>{{/unless}}
<li class="dropdown-header" role="presentation">{{item.group}}</li>
{{/if}}
<li role="presentation" {{bind-attr class="item.active:active item.selected:selected"}}>
<li role="presentation" class="{{if item.active 'active'}} {{if item.selected 'selected'}}">
<a role="menuitem" tabindex="-1" {{action "selectItem" item}}>
{{item.label}}
<span {{bind-attr class=":glyphicon :glyphicon-ok :check-mark item.selected::hidden"}}></span>
<span class="glyphicon glyphicon-ok check-mark {{if item.selected '' 'hidden'}}"></span>
</a>
</li>
{{/each}}
Expand Down