MycroftAI
/
selene-ui
mirror of https://github.com/MycroftAI/selene-ui.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/device-status' into dev

pull/9/head^2
Chris Veilleux 2019-09-12 14:02:55 -05:00
parent 3bb525763f bf113dc3ed
commit 1328203f2f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/account/src/app/modules/skill/setting-field/setting-field.component.ts
View File

@ -36,7 +36,7 @@ export class SettingFieldComponent implements OnInit {
onCheckboxChange(changeEvent: MatCheckboxChange) { onCheckboxChange(changeEvent: MatCheckboxChange) {
this.newValue.emit( this.newValue.emit(
{name: this.fieldDefinition.name, value: changeEvent.checked.toString()} {name: this.fieldDefinition.name, value: changeEvent.checked}
); );
} }

2
projects/account/src/app/shared/models/setting-change.model.ts
View File

@ -1,4 +1,4 @@
export interface SettingChange { export interface SettingChange {
name: string; name: string;
value: string; value: string | boolean | number;
} }

9
projects/market/src/app/skills/skill-summary/skill-card/skill-card.component.html
View File

@ -15,8 +15,9 @@
<mat-card-content [innerHTML]="skill.summary ? skill.summary : '&nbsp;'"> <mat-card-content [innerHTML]="skill.summary ? skill.summary : '&nbsp;'">
</mat-card-content> </mat-card-content>
</div> </div>
<mat-card-actions> <!-- The install button is commented out until the functionality behind it can be fixed. -->
<market-skill-install-button [skill]="skill" [component]="'skillSummary'"> <!-- <mat-card-actions>-->
</market-skill-install-button> <!-- <market-skill-install-button [skill]="skill" [component]="'skillSummary'">-->
</mat-card-actions> <!-- </market-skill-install-button>-->
<!-- </mat-card-actions>-->
</mat-card> </mat-card>