status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ui: Remove string casting when passing index/checked for dropmenus (#9077) 

* ui: Remove string casting when passing index/checked

* Check for e.target
This commit is contained in:
John Cowen 2020-11-02 16:07:08 +00:00 committed by hashicorp-ci
parent 2ac2930b39
commit e2c6e4d069
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/packages/consul-ui/app/components/list-collection/index.js
View File

@ -71,7 +71,7 @@ export default Component.extend(Slotted, {
return this.dom.clickFirstAnchor(e, '.list-collection > ul > li'); return this.dom.clickFirstAnchor(e, '.list-collection > ul > li');
}, },
change: function(index, e = {}) { change: function(index, e = {}) {
if (e.target.checked && index != get(this, 'checked')) { if (e.target.checked && index !== get(this, 'checked')) {
set(this, 'checked', parseInt(index)); set(this, 'checked', parseInt(index));
this.$row = this.dom.closest('li', e.target); this.$row = this.dom.closest('li', e.target);
this.$row.style.zIndex = 1; this.$row.style.zIndex = 1;

2
ui/packages/consul-ui/app/components/tabular-collection/index.hbs
View File

@ -18,7 +18,7 @@
<YieldSlot @name="row">{{yield cell.item index}}</YieldSlot> <YieldSlot @name="row">{{yield cell.item index}}</YieldSlot>
{{#if hasActions }} {{#if hasActions }}
<td class="actions"> <td class="actions">
<YieldSlot @name="actions" @params={{block-params (concat cell.index) (action "change") checked}}> <YieldSlot @name="actions" @params={{block-params cell.index (action "change") checked}}>
{{yield cell.item index}} {{yield cell.item index}}
</YieldSlot> </YieldSlot>
</td> </td>

5
ui/packages/consul-ui/app/components/tabular-collection/index.js
View File

@ -95,13 +95,10 @@ export default CollectionComponent.extend(Slotted, {
return this.dom.clickFirstAnchor(e); return this.dom.clickFirstAnchor(e);
}, },
change: function(index, e = {}) { change: function(index, e = {}) {
if (typeof index !== 'string') {
return;
}
if (this.$tr) { if (this.$tr) {
this.$tr.style.zIndex = null; this.$tr.style.zIndex = null;
} }
if (e.target.checked && index != get(this, 'checked')) { if (e.target && e.target.checked && index !== get(this, 'checked')) {
set(this, 'checked', parseInt(index)); set(this, 'checked', parseInt(index));
const target = e.target; const target = e.target;
const $tr = this.dom.closest('tr', target); const $tr = this.dom.closest('tr', target);