Merge lp:~methanal-developers/methanal/1350779-lookup-infinite-recursion into lp:methanal

[Tristan Seligmann]

[Jonathan Jacobs (jjacobs)]

review: Approve

=== modified file 'methanal/js/Methanal/Widgets.js' (properties changed: -x to +x)
--- methanal/js/Methanal/Widgets.js	2014-07-15 12:41:25 +0000
+++ methanal/js/Methanal/Widgets.js	2014-07-31 10:19:00 +0000
@@ -1428,11 +1428,6 @@
         // Trigger Lookup.onChange so the parent form refreshes validators.
         self.widgetParent.onChange(control.node, self._initialisedOnce);
 
-        if (!self.valid) {
-            self.setResults([]);
-            return;
-        }
-
         // Don't trigger when the result input is changed or when there are
         // validation errors.
         if (control.name === '__result__') {
@@ -1440,6 +1435,11 @@
             return;
         }
 
+        if (!self.valid) {
+            self.setResults([]);
+            return;
+        }
+
         // Gather form values from all the filter attributes.
         var data = {};
         for (var controlName in self.controls) {