Ensure observable subscriptions trigger for emptySelectFirst, ensure …

…before_nested_change and after_nested_change propagate on control change
ambischof · Jul 25, 2019 · bf9b0b9 · bf9b0b9
1 parent 597e4aa
commit bf9b0b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/js/ControlField.js b/src/js/ControlField.js
@@ -437,8 +437,16 @@
 
                     // we use a timeout here because we want this to run AFTER control click handlers
                     setTimeout(function() {
+
+                        // propagate up with "before_nested_change"
+                        self.triggerWithPropagation("before_nested_change", e);
+
                         self.onChange.call(self, e);
                         self.triggerWithPropagation("change", e);
+
+                        // propagate up with "after_nested_change"
+                        self.triggerWithPropagation("after_nested_change", e);
+
                     }, 200);
                 });
 

diff --git a/src/js/fields/list/ListField.js b/src/js/fields/list/ListField.js
@@ -151,13 +151,19 @@
                 {
                     self.selectOptions[0].selected = true;
                     self.data = [self.selectOptions[0]];
+
+                    self.updateObservable();
+                    self.triggerUpdate();
                 }
 
                 // likewise, we auto-assign first pick if field required
                 if (self.data.length === 0 && self.isRequired() && self.selectOptions.length > 0)
                 {
                     self.selectOptions[0].selected = true;
                     self.data = [self.selectOptions[0]];
+
+                    self.updateObservable();
+                    self.triggerUpdate();
                 }
 
                 callback();