1 files changed, 18 insertions, 16 deletions

diff --git a/ext/bg/js/settings/conditions-ui.js b/ext/bg/js/settings/conditions-ui.js
index 5a271321..9d61d25e 100644
--- a/ext/bg/js/settings/conditions-ui.js
+++ b/ext/bg/js/settings/conditions-ui.js
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-/*global conditionsNormalizeOptionValue*/
+/* global
+ * conditionsNormalizeOptionValue
+ */
 
 class ConditionsUI {
     static instantiateTemplate(templateSelector) {
@@ -41,7 +43,7 @@ ConditionsUI.Container = class Container {
             this.children.push(new ConditionsUI.ConditionGroup(this, conditionGroup));
         }
 
-        this.addButton.on('click', () => this.onAddConditionGroup());
+        this.addButton.on('click', this.onAddConditionGroup.bind(this));
     }
 
     cleanup() {
@@ -127,7 +129,7 @@ ConditionsUI.ConditionGroup = class ConditionGroup {
             this.children.push(new ConditionsUI.Condition(this, condition));
         }
 
-        this.addButton.on('click', () => this.onAddCondition());
+        this.addButton.on('click', this.onAddCondition.bind(this));
     }
 
     cleanup() {
@@ -185,10 +187,10 @@ ConditionsUI.Condition = class Condition {
         this.updateOperators();
         this.updateInput();
 
-        this.input.on('change', () => this.onInputChanged());
-        this.typeSelect.on('change', () => this.onConditionTypeChanged());
-        this.operatorSelect.on('change', () => this.onConditionOperatorChanged());
-        this.removeButton.on('click', () => this.onRemoveClicked());
+        this.input.on('change', this.onInputChanged.bind(this));
+        this.typeSelect.on('change', this.onConditionTypeChanged.bind(this));
+        this.operatorSelect.on('change', this.onConditionOperatorChanged.bind(this));
+        this.removeButton.on('click', this.onRemoveClicked.bind(this));
     }
 
     cleanup() {
@@ -235,10 +237,10 @@ ConditionsUI.Condition = class Condition {
     updateInput() {
         const conditionDescriptors = this.parent.parent.conditionDescriptors;
         const {type, operator} = this.condition;
-        const props = {
-            placeholder: '',
-            type: 'text'
-        };
+        const props = new Map([
+            ['placeholder', ''],
+            ['type', 'text']
+        ]);
 
         const objects = [];
         if (hasOwn(conditionDescriptors, type)) {
@@ -252,20 +254,20 @@ ConditionsUI.Condition = class Condition {
 
         for (const object of objects) {
             if (hasOwn(object, 'placeholder')) {
-                props.placeholder = object.placeholder;
+                props.set('placeholder', object.placeholder);
             }
             if (object.type === 'number') {
-                props.type = 'number';
+                props.set('type', 'number');
                 for (const prop of ['step', 'min', 'max']) {
                     if (hasOwn(object, prop)) {
-                        props[prop] = object[prop];
+                        props.set(prop, object[prop]);
                     }
                 }
             }
         }
 
-        for (const prop in props) {
-            this.input.prop(prop, props[prop]);
+        for (const [prop, value] of props.entries()) {
+            this.input.prop(prop, value);
         }
 
         const {valid} = this.validateValue(this.condition.value);