Skip to content

Commit cc0b160

Browse files
authored
Merge pull request #41 from btecu/bugsbunny
Support non-string tokens and ED relationship non-value
2 parents bbce83b + 0efcfd6 commit cc0b160

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

addon/components/select-dropdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export default Component.extend({
7171
if (isEmpty(token)) {
7272
list.forEach(el => el.set('isVisible', true));
7373
} else {
74-
token = token.toLowerCase();
74+
token = typeof token === 'string' ? token.toLowerCase() : token;
7575
this.setVisibility(list, token);
7676
}
7777

addon/components/x-select.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ export default Component.extend(Evented, {
301301
},
302302

303303
setOption(selection, selected, notify) {
304-
let { option, value, label } = this.retrieveOption(selection);
304+
let { option, value, label = '' } = this.retrieveOption(selection);
305305

306306
if (this.get('multiple')) {
307307
label = '';

0 commit comments

Comments
 (0)