diff --git a/src/plugins/condition/Condition.js b/src/plugins/condition/Condition.js index 131f2104e7..556feb766b 100644 --- a/src/plugins/condition/Condition.js +++ b/src/plugins/condition/Condition.js @@ -191,15 +191,12 @@ export default class ConditionClass extends EventEmitter { handleCriterionResult(eventData) { const id = eventData.id; - const conditionData = eventData.data; if (this.findCriterion(id)) { this.criteriaResults[id] = eventData.data.result; } - this.handleConditionUpdated(); - // conditionData.result = computeCondition(this.criteriaResults, this.trigger === TRIGGER.ALL); - // this.emitEvent('conditionResultUpdated', conditionData); + this.handleConditionUpdated(eventData.data); } subscribe() { @@ -209,10 +206,12 @@ export default class ConditionClass extends EventEmitter { }) } - handleConditionUpdated() { + handleConditionUpdated(datum) { // trigger an updated event so that consumers can react accordingly this.evaluate(); - this.emitEvent('conditionResultUpdated', {result: this.result}); + this.emitEvent('conditionResultUpdated', + Object.assign({}, datum, { result: this.result }) + ); } getCriteria() {