web client: mark originally empty field valid when erroneous value cleared

1 files changed, 21 insertions, 22 deletions

diff --git a/web/client.js b/web/client.js
index c856788..8722899 100644
--- a/web/client.js
+++ b/web/client.js
@@ -131,6 +131,26 @@ $(function() {
 			    var tn = _.isObject(newValue);
 			    var npv = tn ? mpath : newValue;
 
+			    function resolve() {
+				if (mpath in invalid &&
+				    invalid[mpath][1] == def) {
+				    
+				    var del = invalid[mpath][0] == null;
+				    delete invalid[mpath];
+				    
+				    if (del)
+					_.each(
+					    _.keys(invalid),
+					    function(p) {
+						if (isRealSubordinate(p, mpath))
+						    delete invalid[p];
+					    }
+					);
+				}
+				
+				def.resolve(isValid());
+			    }
+
 			    function validate() {
 				var options;
 				if (newValue != null)
@@ -147,7 +167,7 @@ $(function() {
 					    data.meta.fields, {name: name}
 					).required)
 					def.reject("Required value not set");
-				    else def.resolve();
+				    else resolve();
 				    return;
 				}
 				
@@ -169,27 +189,6 @@ $(function() {
 					    );
 				    }
 
-				    function resolve() {
-					if (mpath in invalid &&
-					    invalid[mpath][1] == def) {
-
-					    var del = invalid[mpath][0] == null;
-					    delete invalid[mpath];
-
-					    if (del)
-						_.each(
-						    _.keys(invalid),
-						    function(p) {
-							if (isRealSubordinate(
-							    p, mpath
-							)) delete invalid[p];
-						    }
-						);
-					}
-
-					def.resolve(isValid());
-				    }
-
 				    if (tn) query(mpath).done(function(data) {
 					if (mpath in invalid &&
 					    data.meta.type == "model")