Merge branch 'hotfix/builder-fixes'

Author: davidlgj

.travis.yml

@@ -5,3 +5,5 @@ node_js:
 before_script:
   - npm install -g bower
   - bower install
+
+sudo: false

CHANGELOG

@@ -1,3 +1,9 @@
+v0.8.12
+-------
+ * Bugfix for `condition` builder. It had a typo that broke it.
+ * Bugfix for `transclusion` builder.
+
+
 v0.8.11
 -------
  * Bugfix for checkboxes validation in the new builder.

dist/schema-form.js

@@ -232,12 +232,14 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
         for (var i = 0; i < transclusions.length; i++) {
           var n = transclusions[i];
 
-          // The sf-transclude attribute is not a directive, but has the name of what we're supposed to
-          // traverse.
-          var sub = args.form[n.getAttribute('sf-field-transclude')];
-          if (sub) {
-            sub = Array.isArray(sub) ? sub : [sub];
-            var childFrag = args.build(sub, args.path + '.' + sub, args.state);
+          // The sf-transclude attribute is not a directive,
+          // but has the name of what we're supposed to
+          // traverse. Default to `items`
+          var sub = n.getAttribute('sf-field-transclude') || 'items';
+          var items = args.form[sub];
+
+          if (items) {
+            var childFrag = args.build(items, args.path + '.' + sub, args.state);
             n.appendChild(childFrag);
           }
         }
@@ -248,7 +250,7 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
       // but be nice to existing ng-if.
       if (args.form.condition) {
         var evalExpr = 'evalExpr(' + args.path +
-                       '.contidion, { model: model, "arrayIndex": $index})';
+                       '.condition, { model: model, "arrayIndex": $index})';
         if (args.form.key) {
           var strKey = sfPathProvider.stringify(args.form.key);
           evalExpr = 'evalExpr(' + args.path + '.condition,{ model: model, "arrayIndex": $index, ' +

dist/schema-form.min.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-schema-form",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "description": "Create complex forms from a JSON schema with angular.",
   "repository": "Textalk/angular-schema-form",
   "main": "dist/schema-form.min.js",

package.json

@@ -90,12 +90,14 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
         for (var i = 0; i < transclusions.length; i++) {
           var n = transclusions[i];
 
-          // The sf-transclude attribute is not a directive, but has the name of what we're supposed to
-          // traverse.
-          var sub = args.form[n.getAttribute('sf-field-transclude')];
-          if (sub) {
-            sub = Array.isArray(sub) ? sub : [sub];
-            var childFrag = args.build(sub, args.path + '.' + sub, args.state);
+          // The sf-transclude attribute is not a directive,
+          // but has the name of what we're supposed to
+          // traverse. Default to `items`
+          var sub = n.getAttribute('sf-field-transclude') || 'items';
+          var items = args.form[sub];
+
+          if (items) {
+            var childFrag = args.build(items, args.path + '.' + sub, args.state);
             n.appendChild(childFrag);
           }
         }
@@ -106,7 +108,7 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
       // but be nice to existing ng-if.
       if (args.form.condition) {
         var evalExpr = 'evalExpr(' + args.path +
-                       '.contidion, { model: model, "arrayIndex": $index})';
+                       '.condition, { model: model, "arrayIndex": $index})';
         if (args.form.key) {
           var strKey = sfPathProvider.stringify(args.form.key);
           evalExpr = 'evalExpr(' + args.path + '.condition,{ model: model, "arrayIndex": $index, ' +