Merge branch 'release/0.8.4'

davidlgj · davidlgj · commit 356677fbb72b · 2015-07-12T16:59:05.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+v0.8.4
+------
+ * Reverted `trackBy`. Fixes #458, #462, #471
+
+
 v0.8.3
 ------
  * "destroyStrategy" support, thanks @jbsaff! This means that `condition` can now remove values
diff --git a/bower.json b/bower.json
@@ -4,7 +4,7 @@
     "dist/schema-form.js",
     "dist/bootstrap-decorator.js"
   ],
-  "version": "0.8.3",
+  "version": "0.8.4",
   "authors": [
     "Textalk",
     "David Jensen <david.lgj@gmail.com>",
diff --git a/dist/bootstrap-decorator.js b/dist/bootstrap-decorator.js
diff --git a/dist/bootstrap-decorator.min.js b/dist/bootstrap-decorator.min.js
diff --git a/dist/schema-form.js b/dist/schema-form.js
@@ -34,8 +34,8 @@ var schemaForm = angular.module('schemaForm', deps);
 angular.module('schemaForm').provider('sfPath',
 [function() {
 
-  // When building with browserify it's objectpath,
-  // otherwise it's just objectpath.
+  // When building with browserify ObjectPath is available as `objectpath` but othwerwise
+  // it's called `ObjectPath`.
   var ObjectPath = window.ObjectPath || objectpath;
 
   var sfPath = {parse: ObjectPath.parse};
@@ -968,7 +968,7 @@ angular.module('schemaForm').provider('schemaForm',
         return type[0];
     }
     return type;
-  };
+  }
 
   //Creates an default titleMap list from an enum, i.e. a list of strings.
   var enumToTitleMap = function(enm) {
@@ -1101,7 +1101,6 @@ angular.module('schemaForm').provider('schemaForm',
       if (!f.titleMap) {
         f.titleMap = enumToTitleMap(schema['enum']);
       }
-      f.trackBy = 'value';
       options.lookup[sfPathProvider.stringify(options.path)] = f;
       return f;
     }
@@ -1295,10 +1294,6 @@ angular.module('schemaForm').provider('schemaForm',
           obj.titleMap = canonicalTitleMap(obj.titleMap);
         }
 
-        if(obj.type === 'select') {
-          obj.trackBy = obj.trackBy || 'value';
-        }
-
         //
         if (obj.itemForm) {
           obj.items = [];
diff --git a/dist/schema-form.min.js b/dist/schema-form.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-schema-form",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Create complex forms from a JSON schema with angular.",
   "repository": "Textalk/angular-schema-form",
   "main": "dist/schema-form.min.js",
diff --git a/src/directives/decorators/bootstrap/select.html b/src/directives/decorators/bootstrap/select.html
@@ -9,7 +9,7 @@
           sf-changed="form"
           class="form-control {{form.fieldHtmlClass}}"
           schema-validate="form"
-          ng-options="item.value as item.name group by item.group for item in form.titleMap track by item[form.trackBy]"
+          ng-options="item.value as item.name group by item.group for item in form.titleMap"
           name="{{form.key.slice(-1)[0]}}">
   </select>
   <div class="help-block" sf-message="form.description"></div>
diff --git a/src/services/schema-form.js b/src/services/schema-form.js
@@ -13,7 +13,7 @@ angular.module('schemaForm').provider('schemaForm',
         return type[0];
     }
     return type;
-  };
+  }
 
   //Creates an default titleMap list from an enum, i.e. a list of strings.
   var enumToTitleMap = function(enm) {
@@ -146,7 +146,6 @@ angular.module('schemaForm').provider('schemaForm',
       if (!f.titleMap) {
         f.titleMap = enumToTitleMap(schema['enum']);
       }
-      f.trackBy = 'value';
       options.lookup[sfPathProvider.stringify(options.path)] = f;
       return f;
     }
@@ -340,10 +339,6 @@ angular.module('schemaForm').provider('schemaForm',
           obj.titleMap = canonicalTitleMap(obj.titleMap);
         }
 
-        if(obj.type === 'select') {
-          obj.trackBy = obj.trackBy || 'value';
-        }
-
         //
         if (obj.itemForm) {
           obj.items = [];
diff --git a/src/sfPath.js b/src/sfPath.js
@@ -1,8 +1,8 @@
 angular.module('schemaForm').provider('sfPath',
 [function() {
 
-  // When building with browserify it's objectpath,
-  // otherwise it's just objectpath.
+  // When building with browserify ObjectPath is available as `objectpath` but othwerwise
+  // it's called `ObjectPath`.
   var ObjectPath = window.ObjectPath || objectpath;
 
   var sfPath = {parse: ObjectPath.parse};
diff --git a/test/directives/schema-form-test.js b/test/directives/schema-form-test.js
@@ -1649,85 +1649,6 @@ describe('directive',function(){
   });
 
 
-  it('should show the correct option selected', function() {
-    inject(function($compile,$rootScope){
-      var scope = $rootScope.$new();
-      scope.thing = { id: 2, a: 1};
-
-      scope.schema = {
-        "type": "object",
-        "properties": {
-          "thing": {
-            "title": "Thing"
-          }
-        }
-      };
-
-      scope.form = [{
-        key: "thing",
-        type: 'select',
-        titleMap: [{
-          name: 'abc', value: { id: 1, a: 2 }
-        },{
-          name: 'def', value: { id: 2, a: 1 }
-        },{
-          name: 'ghi', value: { id: 3, a: 3 }
-        }]
-      }];
-
-      var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="thing"></form>');
-
-      $compile(tmpl)(scope);
-      $rootScope.$apply();
-
-      setTimeout(function() {
-        tmpl.children().eq(0).find('select').eq(0).val().should.be.eq(2);
-      }, 0);
-
-    });
-  });
-
-
-  it('should show the correct option selected with `track by`', function() {
-    inject(function($compile,$rootScope){
-      var scope = $rootScope.$new();
-      scope.thing = { id: 2, a: 1, b: 2 };
-
-      scope.schema = {
-        "type": "object",
-        "properties": {
-          "thing": {
-            "title": "Thing"
-          }
-        }
-      };
-
-      scope.form = [{
-        key: "thing",
-        type: 'select',
-        titleMap: [{
-          id: 1, name: 'abc', value: { id: 1 }
-        },{
-          id: 2, name: 'def', value: { id: 2 }
-        },{
-          id: 3, name: 'ghi', value: { id: 3 }
-        }],
-        trackBy: 'id'
-      }];
-
-      var tmpl = angular.element('<form sf-schema="schema" sf-form="form" sf-model="thing"></form>');
-
-      $compile(tmpl)(scope);
-      $rootScope.$apply();
-
-      setTimeout(function() {
-        tmpl.children().eq(0).find('select').eq(0).val().should.be.eq(2);
-      }, 0);
-
-    });
-  });
-
-
   it('should update array form on model array ref change',function(){
 
     inject(function($compile,$rootScope){
diff --git a/test/services/schema-form-test.js b/test/services/schema-form-test.js
@@ -91,8 +91,7 @@ describe('schemaForm', function() {
                 "name": "NaN",
                 "value": "NaN"
               }
-            ],
-            "trackBy": "value"
+            ]
           },
           {
             "title": "Are you over 18 years old?",

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +v0.8.4
 +------
 + * Reverted `trackBy`. Fixes #458, #462, #471
++
++
 v0.8.3
 ------
  * "destroyStrategy" support, thanks @jbsaff! This means that `condition` can now remove values
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-schema-form",`
`3`		`- "version": "0.8.3",`
	`3`	`+ "version": "0.8.4",`
`4`	`4`	`"description": "Create complex forms from a JSON schema with angular.",`
`5`	`5`	`"repository": "Textalk/angular-schema-form",`
`6`	`6`	`"main": "dist/schema-form.min.js",`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ angular.module('schemaForm').provider('schemaForm',`
`13`	`13`	`return type[0];`
`14`	`14`	`}`
`15`	`15`	`return type;`
`16`		`- };`
	`16`	`+ }`
`17`	`17`
`18`	`18`	`//Creates an default titleMap list from an enum, i.e. a list of strings.`
`19`	`19`	`var enumToTitleMap = function(enm) {`
`@@ -146,7 +146,6 @@ angular.module('schemaForm').provider('schemaForm',`
`146`	`146`	`if (!f.titleMap) {`
`147`	`147`	`f.titleMap = enumToTitleMap(schema['enum']);`
`148`	`148`	`}`
`149`		`- f.trackBy = 'value';`
`150`	`149`	`options.lookup[sfPathProvider.stringify(options.path)] = f;`
`151`	`150`	`return f;`
`152`	`151`	`}`
`@@ -340,10 +339,6 @@ angular.module('schemaForm').provider('schemaForm',`
`340`	`339`	`obj.titleMap = canonicalTitleMap(obj.titleMap);`
`341`	`340`	`}`
`342`	`341`
`343`		`- if(obj.type === 'select') {`
`344`		`- obj.trackBy = obj.trackBy \|\| 'value';`
`345`		`- }`
`346`		`-`
`347`	`342`	`//`
`348`	`343`	`if (obj.itemForm) {`
`349`	`344`	`obj.items = [];`