Merge branch 'development' of github.com:Textalk/angular-schema-form into development

Conflicts:
	src/directives/decorators/bootstrap/default.html
	src/directives/decorators/bootstrap/textarea.html

Author: Michael Stramel

.npmignore

@@ -0,0 +1 @@
+    **/.*

CHANGELOG

@@ -1,3 +1,24 @@
+v0.7.8
+------
+* Thanks to @burdiuz for finding a memory leak issue and finding a solution. And thanks to @davidlgj for implementing that solution.
+* Post render event, thanks @mrijken
+* Events documentation, thanks @Dervisevic
+* startEmpty documentation, thanks @davidlj
+* npm and bower updates, thanks @Dervisevic
+* x-schema-form attribute, thanks @davidlgj
+* htmlClass and fieldHtmlClass form options, thanks @davidlgj
+
+v0.7.7
+------
+ * Array ref changes in model updates form, thanks @Sandreu
+ * Tabarray & array fixes, thanks @Sandreu, @davidlgj
+ * Use objectpath more generically to fix requirejs issues, thanks @mike-marcacci
+ * README and documentation updates, thanks @davidlgj, @engelfrost, @Dervisevic, @stramel, @Sandreu
+ * Expanded documentation on custom validation messages, thanks @Dervisevic
+ * Deep structure tests, thanks @Sandreu
+ * SF-insert-field documentation, thanks @davidlgj
+ * Array model watch & array defaults, thanks @Sandreu
+
 v0.7.6
 ------
  * Fixed broken bower specification.

README.md

@@ -4,6 +4,7 @@ Angular Schema Form
 [![Build Status](https://travis-ci.org/Textalk/angular-schema-form.svg?branch=master)](https://travis-ci.org/Textalk/angular-schema-form)
 [![Coverage Status](https://coveralls.io/repos/Textalk/angular-schema-form/badge.png?branch=master)](https://coveralls.io/r/Textalk/angular-schema-form?branch=development)
 [![Bower version](https://badge.fury.io/bo/angular-schema-form.svg)](http://badge.fury.io/bo/angular-schema-form)
+[![npm version](https://badge.fury.io/js/angular-schema-form.svg)](http://badge.fury.io/js/angular-schema-form)
 
 Generate forms from JSON schemas using AngularJS!
 
@@ -145,12 +146,13 @@ angular.module('myModule', ['schemaForm']);
 
 Add-ons
 ------
-There is currently three add-ons, a date picker, a colorpicker and the wysiwyg html editor tinymce.
+There are a couple of add-ons, a date picker, a colorpicker and two wysiwyg editors. 
 They have their own repos and you can find them here with usage instructions:
 
   * [https://github.com/Textalk/angular-schema-form-datepicker](https://github.com/Textalk/angular-schema-form-datepicker)
   * [https://github.com/Textalk/angular-schema-form-colorpicker](https://github.com/Textalk/angular-schema-form-colorpicker)
   * [https://github.com/Textalk/angular-schema-form-tinymce](https://github.com/Textalk/angular-schema-form-tinymce)
+  * [https://github.com/webcanvas/angular-schema-form-ckeditor](https://github.com/webcanvas/angular-schema-form-ckeditor)
 
 Your can also [create your own add-ons!](docs/extending.md)
 

bower.json

@@ -4,10 +4,13 @@
     "dist/schema-form.min.js",
     "dist/bootstrap-decorator.min.js"
   ],
-  "version": "0.7.6",
+  "version": "0.7.8",
   "authors": [
     "Textalk",
-    "David Jensen <david.lgj@gmail.com>"
+    "David Jensen <david.lgj@gmail.com>",
+    "Cameron Edwards",
+    "Mike Marcacci",
+    "Denis Dervisevic <denis@dervisevic.se>"
   ],
   "moduleType": [
     "globals"
@@ -23,10 +26,17 @@
   "license": "MIT",
   "ignore": [
     "**/.*",
+    "*.js",
+    "*.json",
     "node_modules",
     "bower_components",
     "test",
-    "coverage"
+    "coverage",
+    "docs",
+    "examples",
+    "gulp",
+    "CHANGELOG",
+    "LICENSE"
   ],
   "dependencies": {
     "angular": ">= 1.2",

dist/bootstrap-decorator.min.js

@@ -481,8 +481,15 @@ angular.module('schemaForm').provider('schemaForm',
       var def;
       for (var i = 0; i < rules.length; i++) {
         def = rules[i](name, schema, options);
+
         //first handler in list that actually returns something is our handler!
         if (def) {
+
+          // Do we have form defaults in the schema under the x-schema-form-attribute?
+          if (def.schema['x-schema-form'] && angular.isObject(def.schema['x-schema-form'])) {
+            def = angular.extend(def, def.schema['x-schema-form']);
+          }
+
           return def;
         }
       }
@@ -508,14 +515,16 @@ angular.module('schemaForm').provider('schemaForm',
     if (schema.minimum) { f.minimum = schema.minimum + (schema.exclusiveMinimum ? 1 : 0); }
     if (schema.maximum) { f.maximum = schema.maximum - (schema.exclusiveMaximum ? 1 : 0); }
 
-    //Non standard attributes
+    // Non standard attributes (DONT USE DEPRECATED)
+    // If you must set stuff like this in the schema use the x-schema-form attribute
     if (schema.validationMessage) { f.validationMessage = schema.validationMessage; }
     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
     // globally though
     f.ngModelOptions = f.ngModelOptions || {};
+
     return f;
   };
 
@@ -1279,7 +1288,7 @@ angular.module('schemaForm')
         //Since we are dependant on up to three
         //attributes we'll do a common watch
         var lastDigest = {};
-
+        var childScope;
         scope.$watch(function() {
 
           var schema = scope.schema;
@@ -1295,8 +1304,17 @@ angular.module('schemaForm')
             var merged = schemaForm.merge(schema, form, ignore, scope.options);
             var frag = document.createDocumentFragment();
 
+            // Create a new form and destroy the old one.
+            // Not doing keeps old form elements hanging around after
+            // they have been removed from the DOM
+            // https://github.com/Textalk/angular-schema-form/issues/200
+            if (childScope) {
+              childScope.$destroy();
+            }
+            childScope = scope.$new();
+
             //make the form available to decorators
-            scope.schemaForm  = {form:  merged, schema: schema};
+            childScope.schemaForm  = {form:  merged, schema: schema};
 
             //clean all but pre existing html.
             element.children(':not(.schema-form-ignore)').remove();
@@ -1335,7 +1353,7 @@ angular.module('schemaForm')
             element[0].appendChild(frag);
 
             //compile only children
-            $compile(element.children())(scope);
+            $compile(element.children())(childScope);
 
             //ok, now that that is done let's set any defaults
             schemaForm.traverseSchema(schema, function(prop, path) {
@@ -1346,7 +1364,8 @@ angular.module('schemaForm')
                 }
               }
             });
-          }
+          };
+          scope.$emit('sf-render-finished', element);
         });
       }
     };