Improved the indexOf check that adds to repeaterFieldsToWatch, Doesn'…

…t run multiple times on load now.
graham73may · Nov 30, 2016 · 529db88 · 529db88
1 parent 6ef8e59
commit 529db88
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/web/conditional-fields.js b/web/conditional-fields.js
@@ -64,11 +64,9 @@
                         if (allRepeaterFields[field]['condition'].hasOwnProperty('field')) {
                             fieldName = allRepeaterFields[field]['condition']['field'];
 
-                            regexPattern = new RegExp(name + '\\[\\d+\\]\\[' + fieldName + '\\]');
-
-                            if (repeaterFieldsToWatch.indexOf(regexPattern.toString()) === -1) {
+                            if (repeaterFieldsToWatch.indexOf(name + '\\[\\d+\\]\\[' + fieldName + '\\]') === -1) {
                                 // Fields to watch the value change of
-                                repeaterFieldsToWatch.push(regexPattern);
+                                repeaterFieldsToWatch.push(name + '\\[\\d+\\]\\[' + fieldName + '\\]');
                             }
 
                             repeaterToAdd = allRepeaterFields[field];
@@ -77,7 +75,6 @@
                             repeaterToAdd['repeater'] = name;
 
                             // Add this field to the repeaterFields array
-                            //repeaterFields[name + ':' + field] = repeaterToAdd;
                             repeaterFields[field] = repeaterToAdd;
                         }
                     }