Move form lookup to controller

Using angular.element.data doesn't work with arrays inside ng-repeat

Author: davidlgj

src/directives/field.js

@@ -9,9 +9,9 @@ angular.module('schemaForm').directive('sfField',
         replace: false,
         transclude: false,
         scope: true,
-        require: '?^sfSchema',
+        require: '^sfSchema',
         link: {
-          pre: function(scope, element, attrs) {
+          pre: function(scope, element, attrs, sfSchema) {
             //The ngModelController is used in some templates and
             //is needed for error messages,
             scope.$on('schemaFormPropagateNgModelController', function(event, ngModel) {
@@ -21,7 +21,7 @@ angular.module('schemaForm').directive('sfField',
             });
 
             // Fetch our form.
-            scope.form = element.data('sfForm');
+            scope.form = sfSchema.lookup['f' + attrs.sfField];
           },
           post: function(scope, element, attrs, sfSchema) {
             //Keep error prone logic from the template

src/directives/schema-form.js

@@ -19,6 +19,15 @@ angular.module('schemaForm')
         this.evalInParentScope = function(expr, locals) {
           return $scope.$parent.$eval(expr, locals);
         };
+
+        // Set up form lookup map
+        var that  = this;
+        $scope.lookup = function(lookup) {
+          if (lookup) {
+            that.lookup = lookup;
+          }
+          return that.lookup;
+        };
       }],
       replace: false,
       restrict: 'A',
@@ -86,13 +95,13 @@ angular.module('schemaForm')
 
           // if sfUseDecorator is undefined the default decorator is used.
           var decorator = schemaFormDecorators.decorator(attrs.sfUseDecorator);
-
           // Use the builder to build it and append the result
-          element[0].appendChild( sfBuilder.build(merged, decorator, slots) );
-
+          var lookup = Object.create(null);
+          scope.lookup(lookup); // give the new lookup to the controller.
+          element[0].appendChild(sfBuilder.build(merged, decorator, slots, lookup));
           //compile only children
           $compile(element.children())(childScope);
-
+          
           //ok, now that that is done let's set any defaults
           if (!scope.options || scope.options.setSchemaDefaults !== false) {
             schemaForm.traverseSchema(schema, function(prop, path) {
@@ -106,6 +115,7 @@ angular.module('schemaForm')
           }
 
           scope.$emit('sf-render-finished', element);
+console.timeEnd('render')
         };
 
         var defaultForm = ['*'];

src/services/builder.js

@@ -9,11 +9,15 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
       return (pos ? separator : '') + letter.toLowerCase();
     });
   };
+  var formId = 0;
 
   var builders = {
     sfField: function(args) {
-      args.fieldFrag.firstChild.setAttribute('sf-field', args.path);
-      angular.element.data(args.fieldFrag.firstChild, 'sfForm', args.form);
+      args.fieldFrag.firstChild.setAttribute('sf-field', formId);
+
+      // We use a lookup table for easy access to our form.
+      args.lookup['f' + formId] = args.form;
+      formId++;
     },
     ngModel: function(args) {
       if (!args.form.key) {
@@ -117,8 +121,9 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
       }
     };
 
-    var build = function(items, decorator, templateFn, slots, path, state) {
+    var build = function(items, decorator, templateFn, slots, path, state, lookup) {
       state = state || {};
+      lookup = lookup || Object.create(null);
       path = path || 'schemaForm.form';
       var container = document.createDocumentFragment();
       items.reduce(function(frag, f, index) {
@@ -155,12 +160,13 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
           var args = {
             fieldFrag: tmpl,
             form: f,
+            lookup: lookup,
             state: state,
             path: path + '[' + index + ']',
 
             // Recursive build fn
             build: function(items, path, state) {
-              return build(items, decorator, templateFn, slots, path, state);
+              return build(items, decorator, templateFn, slots, path, state, lookup);
             },
 
           };
@@ -185,10 +191,10 @@ angular.module('schemaForm').provider('sfBuilder', ['sfPathProvider', function(s
         /**
          * Builds a form from a canonical form definition
          */
-        build: function(form, decorator, slots) {
+        build: function(form, decorator, slots, lookup) {
           return build(form, decorator, function(url) {
             return $templateCache.get(url);
-          }, slots);
+          }, slots, undefined, undefined, lookup);
 
         },
         builder: builders,