Merge branch 'enum-maintain-order-select-options-2' of https://github.com/EagerIO/angular-schema-form into EagerIO-enum-maintain-order-select-options-2

Author: davidlgj

src/services/schema-form.js

@@ -17,12 +17,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;
@@ -63,7 +69,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

test/schema-form-test.js

@@ -1571,6 +1571,46 @@ describe('Schema form',function(){
       });
     });
 
+    it('should sort select options by enum',function(){
+
+      inject(function($compile,$rootScope){
+        var scope = $rootScope.$new();
+        scope.person = {};
+
+        scope.schema = {
+          "type": "object",
+          "properties": {
+            "thing": {
+              "type": "string",
+              "title": "Thing",
+              "enum": [
+                // Intentionally non-alphabetical
+                // https://github.com/Textalk/angular-schema-form/issues/82
+                // https://github.com/Textalk/angular-schema-form/issues/83
+                "b",
+                "a"
+              ],
+              "enumNames": {
+                // Intentionally not the same order as the `enum`
+                "a": "The A",
+                "b": "The B"
+              }
+            }
+          }
+        };
+
+        scope.form = ["*"];
+
+        var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="person"></form>');
+
+        $compile(tmpl)(scope);
+        $rootScope.$apply();
+
+        tmpl.children().eq(0).find('select').eq(0).find('option').eq(0).text().trim().should.be.eq('');
+        tmpl.children().eq(0).find('select').eq(0).find('option').eq(1).text().trim().should.be.eq('The B');
+        tmpl.children().eq(0).find('select').eq(0).find('option').eq(2).text().trim().should.be.eq('The A');
+      });
+    });
 
   });