Merge pull request #179 from clint-tseng/cxlt/minor-fixes

Some minor fixes
getodk · Jul 27, 2017 · 532f8f7 · 532f8f7
2 parents edc42f4 + b5178ca
commit 532f8f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/public/javascripts/core.validation.js b/public/javascripts/core.validation.js
@@ -213,13 +213,16 @@
 
                 propertiesRouting[param][id].f = go = function()
                 {
+                    // if we have been reaped since our check was scheduled (eg by an open-form op), bail.
+                    if ((controls.length > 0) && !document.body.contains(controls[0])) return;
+
                     f(_.map(controls, function(control) { return $(control).data('odkControl-properties')[param].value; }));
                     scheduled = false;
                 };
 
                 if (scheduled === false)
                 {
-                    _.defer(function() { go(); });
+                    _.defer(go);
                     scheduled = true;
                 }
             };

diff --git a/public/javascripts/data.js b/public/javascripts/data.js
@@ -110,6 +110,7 @@ var dataNS = odkmaker.namespace.load('odkmaker.data');
         $('.control').trigger('odkControl-removing');
         $('.control').trigger('odkControl-removed');
         $('.workspace').empty();
+        odkmaker.application.clearProperties();
 
         $('h1').text(formObj.title);
         $('#formProperties_title').val(formObj.metadata.htitle)