Fix for checkboxes when model is undefined

json-schema-form · Sep 24, 2015 · d503bfe · d503bfe
1 parent b37f208
commit d503bfe
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/dist/schema-form.js b/dist/schema-form.js
@@ -2293,6 +2293,18 @@ function(sel, sfPath, schemaForm) {
         }
       };
 
+      // If model is undefined make sure it gets set.
+      var getOrCreateModel = function() {
+        var model = scope.modelArray;
+        if (!model) {
+          var selection = sfPath.parse(attrs.sfNewArray);
+          model = [];
+          sel(selection, scope, model);
+          scope.modelArray = model;
+        }
+        return model;
+      };
+
       // We need the form definition to make a decision on how we should listen.
       var once = scope.$watch('form', function(form) {
         if (!form) {
@@ -2363,7 +2375,7 @@ function(sel, sfPath, schemaForm) {
           //To get two way binding we also watch our titleMapValues
           scope.$watchCollection('titleMapValues', function(vals, old) {
             if (vals && vals !== old) {
-              var arr = scope.modelArray;
+              var arr = getOrCreateModel();
 
               // Apparently the fastest way to clear an array, readable too.
               // http://jsperf.com/array-destroy/32
@@ -2392,13 +2404,7 @@ function(sel, sfPath, schemaForm) {
         var empty;
 
         // Create and set an array if needed.
-        var model = scope.modelArray;
-        if (!model) {
-          var selection = sfPath.parse(attrs.sfNewArray);
-          model = [];
-          sel(selection, scope, model);
-          scope.modelArray = model;
-        }
+        var model = getOrCreateModel();
 
         // Same old add empty things to the array hack :(
         if (scope.form && scope.form.schema && scope.form.schema.items) {