Gulped

Author: davidlgj

dist/schema-form.js

@@ -1308,88 +1308,107 @@ 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;
-          var form   = scope.initialForm || ['*'];
+        // Common renderer function, can either be triggered by a watch or by an event.
+        var render = function(schema, form) {
+          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();
 
-          //The check for schema.type is to ensure that schema is not {}
-          if (form && schema && schema.type &&
-              (lastDigest.form !== form || lastDigest.schema !== schema) &&
-              Object.keys(schema.properties).length > 0) {
-            lastDigest.schema = schema;
-            lastDigest.form = form;
+          //make the form available to decorators
+          childScope.schemaForm  = {form:  merged, schema: schema};
 
-            var merged = schemaForm.merge(schema, form, ignore, scope.options);
-            var frag = document.createDocumentFragment();
+          //clean all but pre existing html.
+          element.children(':not(.schema-form-ignore)').remove();
 
-            // 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();
+          // Find all slots.
+          var slots = {};
+          var slotsFound = element[0].querySelectorAll('*[sf-insert-field]');
+
+          for (var i = 0; i < slotsFound.length; i++) {
+            slots[slotsFound[i].getAttribute('sf-insert-field')] = slotsFound[i];
+          }
+
+          //Create directives from the form definition
+          angular.forEach(merged, function(obj, i) {
+            var n = document.createElement(attrs.sfDecorator ||
+                                           snakeCase(schemaFormDecorators.defaultDecorator, '-'));
+            n.setAttribute('form', 'schemaForm.form[' + i + ']');
+
+            // Check if there is a slot to put this in...
+            if (obj.key) {
+              var slot = slots[sfPath.stringify(obj.key)];
+              if (slot) {
+                while (slot.firstChild) {
+                  slot.removeChild(slot.firstChild);
+                }
+                slot.appendChild(n);
+                return;
+              }
             }
-            childScope = scope.$new();
 
-            //make the form available to decorators
-            childScope.schemaForm  = {form:  merged, schema: schema};
+            // ...otherwise add it to the frag
+            frag.appendChild(n);
+
+          });
 
-            //clean all but pre existing html.
-            element.children(':not(.schema-form-ignore)').remove();
+          element[0].appendChild(frag);
 
-            // Find all slots.
-            var slots = {};
-            var slotsFound = element[0].querySelectorAll('*[sf-insert-field]');
+          //compile only children
+          $compile(element.children())(childScope);
 
-            for (var i = 0; i < slotsFound.length; i++) {
-              slots[slotsFound[i].getAttribute('sf-insert-field')] = slotsFound[i];
+          //ok, now that that is done let's set any defaults
+          schemaForm.traverseSchema(schema, function(prop, path) {
+            if (angular.isDefined(prop['default'])) {
+              var val = sfSelect(path, scope.model);
+              if (angular.isUndefined(val)) {
+                sfSelect(path, scope.model, prop['default']);
+              }
             }
+          });
 
-            //Create directives from the form definition
-            angular.forEach(merged, function(obj, i) {
-              var n = document.createElement(attrs.sfDecorator ||
-                                             snakeCase(schemaFormDecorators.defaultDecorator, '-'));
-              n.setAttribute('form','schemaForm.form['+i+']');
-
-              // Check if there is a slot to put this in...
-              if (obj.key) {
-                var slot = slots[sfPath.stringify(obj.key)];
-                if (slot) {
-                  while (slot.firstChild) {
-                    slot.removeChild(slot.firstChild);
-                  }
-                  slot.appendChild(n);
-                  return;
-                }
-              }
+          scope.$emit('sf-render-finished', element);
+        };
 
-              // ...otherwise add it to the frag
-              frag.appendChild(n);
+        //Since we are dependant on up to three
+        //attributes we'll do a common watch
+        scope.$watch(function() {
 
-            });
+          var schema = scope.schema;
+          var form   = scope.initialForm || ['*'];
 
-            element[0].appendChild(frag);
+          //The check for schema.type is to ensure that schema is not {}
+          if (form && schema && schema.type &&
+              (lastDigest.form !== form || lastDigest.schema !== schema) &&
+              Object.keys(schema.properties).length > 0) {
+            lastDigest.schema = schema;
+            lastDigest.form = form;
 
-            //compile only children
-            $compile(element.children())(childScope);
+            render(schema, form);
+          }
+        });
 
-            //ok, now that that is done let's set any defaults
-            schemaForm.traverseSchema(schema, function(prop, path) {
-              if (angular.isDefined(prop['default'])) {
-                var val = sfSelect(path, scope.model);
-                if (angular.isUndefined(val)) {
-                  sfSelect(path, scope.model, prop['default']);
-                }
-              }
-            });
-          };
-          scope.$emit('sf-render-finished', element);
+        // We also listen to the event schemaFormRedraw so you can manually trigger a change if
+        // part of the form or schema is chnaged without it being a new instance.
+        scope.$on('schemaFormRedraw', function() {
+          var schema = scope.schema;
+          var form   = scope.initialForm || ['*'];
+          if (schema) {
+            render(schema, form);
+          }
         });
+
       }
     };
   }