Merge branch 'release/v0.7.3'

Author: davidlgj

CHANGELOG

@@ -1,3 +1,12 @@
+v0.7.3
+------
+ * Fix for regression in enum order in selects, thanks @adamschwartz
+ * Descriptons in fieldsets, thanks @mike-marcacci
+ * Evaluate sfModel in the parent scope, thanks @mike-marcacci
+ * 'defaultFormDefinition' is now exported on the schemaForm provider making it possible to create
+   addons that have arbitrary forms inside them, i.e. like fieldset.
+ * A couple of bugs, required should now work fine, tabarrays behave, list tags be mathed etc
+
 v0.7.2
 ------
  * Add-ons now have their own repos, and there is a colorpicker!

bower.json

@@ -5,7 +5,7 @@
     "dist/bootstrap-decorator.min.js",
     "dist/bootstrap-datepicker.min.js"
   ],
-  "version": "0.7.2",
+  "version": "0.7.3",
   "authors": [
     "Textalk",
     "David Jensen <[email protected]>"

dist/bootstrap-datepicker.min.js

@@ -456,12 +456,18 @@ angular.module('schemaForm').provider('schemaForm',
 
   // Takes a titleMap in either object or list format and returns one in
   // in the list format.
-  var canonicalTitleMap = function(titleMap) {
+  var canonicalTitleMap = function(titleMap, originalEnum) {
     if (!angular.isArray(titleMap)) {
       var canonical = [];
-      angular.forEach(titleMap, function(name, value) {
-        canonical.push({name: name, value: value});
-      });
+      if (originalEnum) {
+        angular.forEach(originalEnum, function(value, index) {
+          canonical.push({name: titleMap[value], value: value});
+        });
+      } else {
+        angular.forEach(titleMap, function(name, value) {
+          canonical.push({name: name, value: value});
+        });
+      }
       return canonical;
     }
     return titleMap;
@@ -502,7 +508,7 @@ angular.module('schemaForm').provider('schemaForm',
 
     //Non standard attributes
     if (schema.validationMessage) { f.validationMessage = schema.validationMessage; }
-    if (schema.enumNames) { f.titleMap = canonicalTitleMap(schema.enumNames); }
+    if (schema.enumNames) { f.titleMap = canonicalTitleMap(schema.enumNames, schema.enum); }
     f.schema = schema;
 
     // Ng model options doesn't play nice with undefined, might be defined
@@ -658,8 +664,9 @@ angular.module('schemaForm').provider('schemaForm',
   /**
    * Provider API
    */
-  this.defaults    = defaults;
-  this.stdFormObj  = stdFormObj;
+  this.defaults              = defaults;
+  this.stdFormObj            = stdFormObj;
+  this.defaultFormDefinition = defaultFormDefinition;
 
   /**
    * Register a post process function.
@@ -718,7 +725,6 @@ angular.module('schemaForm').provider('schemaForm',
       options = options || {};
 
       var stdForm = service.defaults(schema, ignore, options);
-
       //simple case, we have a "*", just put the stdForm there
       var idx = form.indexOf('*');
       if (idx !== -1) {
@@ -738,11 +744,29 @@ angular.module('schemaForm').provider('schemaForm',
           obj = {key: obj};
         }
 
+        if (obj.key) {
+          if (typeof obj.key === 'string') {
+            obj.key = sfPathProvider.parse(obj.key);
+          }
+        }
+
         //If it has a titleMap make sure it's a list
         if (obj.titleMap) {
           obj.titleMap = canonicalTitleMap(obj.titleMap);
         }
 
+        //
+        if (obj.itemForm) {
+          obj.items = [];
+          var str = sfPathProvider.stringify(obj.key);
+          var stdForm = lookup[str];
+          angular.forEach(stdForm.items, function(item) {
+            var o = angular.copy(obj.itemForm);
+            o.key = item.key;
+            obj.items.push(o);
+          });
+        }
+
         //if it's a type with items, merge 'em!
         if (obj.items) {
           obj.items = service.merge(schema, obj.items, ignore);
@@ -757,10 +781,6 @@ angular.module('schemaForm').provider('schemaForm',
 
         //extend with std form from schema.
         if (obj.key) {
-          if (typeof obj.key === 'string') {
-            obj.key = sfPathProvider.parse(obj.key);
-          }
-
           var str = sfPathProvider.stringify(obj.key);
           if (lookup[str]) {
             obj = angular.extend(lookup[str], obj);
@@ -789,7 +809,7 @@ angular.module('schemaForm').provider('schemaForm',
       if (schema.type === 'object') {
         angular.forEach(schema.properties, function(v, k) {
           if (ignore[k] !== true) {
-            var required = schema.required && schema.required.indexOf(k[k.length - 1]) !== -1;
+            var required = schema.required && schema.required.indexOf(k) !== -1;
             var def = defaultFormDefinition(k, v, {
               path: [k],         // Path to this property in bracket notation.
               lookup: lookup,    // Extra map to register with. Optimization for merger.
@@ -1019,6 +1039,7 @@ angular.module('schemaForm').directive('sfArray', ['sfSelect', 'schemaForm', 'sf
             if (scope.validateArray) {
               scope.validateArray();
             }
+            return list;
           };
 
           // Always start with one empty form unless configured otherwise.
@@ -1178,7 +1199,8 @@ angular.module('schemaForm')
       scope: {
         schema: '=sfSchema',
         initialForm: '=sfForm',
-        model: '=sfModel'
+        model: '=sfModel',
+        options: '=sfOptions'
       },
       controller: ['$scope', function($scope) {
         this.evalInParentScope = function(expr, locals) {
@@ -1231,10 +1253,7 @@ angular.module('schemaForm')
             lastDigest.schema = schema;
             lastDigest.form = form;
 
-            // Check for options
-            var options = scope.$eval(attrs.sfOptions);
-
-            var merged = schemaForm.merge(schema, form, ignore, options);
+            var merged = schemaForm.merge(schema, form, ignore, scope.options);
             var frag = document.createDocumentFragment();
 
             //make the form available to decorators