diff --git a/_locales/en/messages.json b/_locales/en/messages.json index d3cc7528..d6f70bb5 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -3152,6 +3152,9 @@ "logicClose": { "message": "Close" }, + "logicActivator": { + "message": "Active" + }, "save": { "message": "Save" }, diff --git a/js/logicCondition.js b/js/logicCondition.js index c1fc3a81..1db77def 100644 --- a/js/logicCondition.js +++ b/js/logicCondition.js @@ -73,6 +73,7 @@ let LogicCondition = function (enabled, activatorId, operation, operandAType, op let $cT = $(event.currentTarget); self.setEnabled(!!$cT.prop('checked')); self.renderStatus(); + self.renderActivator(); }; self.getOperatorMetadata = function () { @@ -205,6 +206,28 @@ let LogicCondition = function (enabled, activatorId, operation, operandAType, op } } + self.onActivatorChange = function (event) { + let $cT = $(event.currentTarget); + + self.setActivatorId($cT.val()); + } + + self.renderActivator = function () { + let $e = $row.find(".logic_cell__activator"); + + if (self.getEnabled()) { + GUI.renderLogicConditionSelect( + $e, + LOGIC_CONDITIONS, + self.getActivatorId, + self.onActivatorChange, + true + ); + } else { + $e.html(""); + } + } + self.render = function (index, $container) { $container.find('tbody').append('\ @@ -213,6 +236,7 @@ let LogicCondition = function (enabled, activatorId, operation, operandAType, op \ \ \ + \ \ \ \ @@ -247,6 +271,7 @@ let LogicCondition = function (enabled, activatorId, operation, operandAType, op self.renderOperand(0); self.renderOperand(1); self.renderStatus(); + self.renderActivator(); } return self; diff --git a/tabs/mixer.html b/tabs/mixer.html index 7d8a8226..271929dd 100644 --- a/tabs/mixer.html +++ b/tabs/mixer.html @@ -137,6 +137,7 @@ + diff --git a/tabs/programming.html b/tabs/programming.html index d57a4411..f7119dc2 100644 --- a/tabs/programming.html +++ b/tabs/programming.html @@ -43,6 +43,7 @@ +