refactor: Macro

This commit is contained in:
Farkas József
2016-09-25 13:56:03 +02:00
parent 2aed594dd1
commit 140709e31f
4 changed files with 18 additions and 14 deletions

View File

@@ -1,8 +1,8 @@
<macro-header [macro]="macro"></macro-header>
<div class="row list-container">
<div class="col-xs-10 col-xs-offset-1 list-group">
<div class="macro-actions-container" [dragula]="'macroActions'" [dragulaModel]="macro.macroActions.elements">
<macro-item *ngFor="let macroAction of macro.macroActions.elements; let macroActionIndex = index"
<div class="macro-actions-container" [dragula]="'macroActions'" [dragulaModel]="macro.macroActions">
<macro-item *ngFor="let macroAction of macro.macroActions; let macroActionIndex = index"
[macroAction]="macroAction"
[editable]="true"
[deletable]="true"

View File

@@ -58,8 +58,8 @@ export class MacroComponent implements OnInit, OnDestroy {
}
addAction() {
this.hideOtherActionEditors(this.macro.macroActions.elements.length);
this.macro.macroActions.elements.push(undefined);
this.hideOtherActionEditors(this.macro.macroActions.length);
this.macro.macroActions.push(undefined);
}
discardChanges() {
@@ -83,12 +83,12 @@ export class MacroComponent implements OnInit, OnDestroy {
onSaveAction(macroAction: MacroAction, index: number) {
this.hasChanges = true;
this.macro.macroActions.elements[index] = macroAction;
this.macro.macroActions[index] = macroAction;
}
onDeleteAction(index: number) {
// @ todo show confirm action dialog
this.macro.macroActions.elements.splice(index, 1);
this.macro.macroActions.splice(index, 1);
this.hasChanges = true;
}

View File

@@ -5,7 +5,7 @@
<div class="macro-action-container" [class.inactive]="selectedMacroIndex === -1">
<template [ngIf]="selectedMacroIndex >= 0">
<div class="list-group">
<macro-item *ngFor="let macroAction of macros[selectedMacroIndex].macroActions.elements"
<macro-item *ngFor="let macroAction of macros[selectedMacroIndex].macroActions"
[macroAction]="macroAction">
</macro-item>
</div>