Moved builders and array directive to main repo.

Author: davidlgj

src/bootstrap-decorator.js

@@ -6,58 +6,10 @@ function(decoratorsProvider, sfBuilderProvider, sfPathProvider) {
   var ngModelOptions = sfBuilderProvider.builders.ngModelOptions;
   var ngModel        = sfBuilderProvider.builders.ngModel;
   var sfField        = sfBuilderProvider.builders.sfField;
+  var condition      = sfBuilderProvider.builders.condition;
+  var array          = sfBuilderProvider.builders.array;
 
-  var condition = function(args) {
-    // Do we have a condition? Then we slap on an ng-if on all children,
-    // but be nice to existing ng-if.
-    if (args.form.condition) {
-      var evalExpr = 'evalExpr(' + args.path + '.contidion, { model: model, "arrayIndex": $index})';
-      if (args.form.key) {
-        var strKey = sfPathProvider.stringify(args.form.key);
-        evalExpr = 'evalExpr(' + args.path + '.condition,{ model: model, "arrayIndex": $index, ' +
-                   '"modelValue": model' + (strKey[0] === '[' ? '' : '.') + strKey + '})';
-      }
-
-      var children = args.fieldFrag.children;
-      for (var i = 0; i < children.length; i++) {
-        var child = children[i];
-        var ngIf = child.getAttribute('ng-if');
-        child.setAttribute(
-          'ng-if',
-          ngIf ?
-          '(' + ngIf +
-          ') || (' + evalExpr + ')'
-          : evalExpr
-        );
-      }
-    }
-  };
-
-  var array = function(args) {
-    var items = args.fieldFrag.querySelector('[schema-form-array-items]');
-    if (items) {
-      state = angular.copy(args.state);
-      state.keyRedaction = state.keyRedaction || 0;
-      state.keyRedaction += args.form.key.length + 1;
-
-      // Special case, an array with just one item in it that is not an object.
-      // So then we just override the modelValue
-      if (args.form.schema && args.form.schema.items &&
-          args.form.schema.items.type &&
-          args.form.schema.items.type.indexOf('object') === -1 &&
-          args.form.schema.items.type.indexOf('array') === -1) {
-        var strKey = sfPathProvider.stringify(args.form.key).replace(/"/g, '&quot;') + '[$index]';
-        state.modelValue = 'modelArray[$index]'; //(args.state.modelName || 'model') + (strKey[0] !== '[' ? '.' : '') + strKey;
-        //state.modelValue = 'model' + sfPathProvider.normalize(args.form.key) + '[$index]'; // 'modelArray[$index]';
-      } else {
-        state.modelName = 'item';
-      }
-
-      var childFrag = args.build(args.form.items, args.path + '.items', state);
-      items.appendChild(childFrag);
-    }
-  };
-
+  // Tabs is so bootstrap specific that it stays here.
   var tabs = function(args) {
     if (args.form.tabs && args.form.tabs.length > 0) {
       var tabContent = args.fieldFrag.querySelector('.tab-content');
@@ -100,170 +52,4 @@ function(decoratorsProvider, sfBuilderProvider, sfPathProvider) {
     'default': {template: base + 'default.html', builder: defaults}
   }, []);
 
-}])
-
-/* Directives here are WIP, will be moved to main repo or their own files when solidifying */
-.directive('sfNewArray', ['sfSelect', 'sfPath', function(sel, sfPath) {
-  return {
-    scope: false,
-    link: function(scope, element, attrs) {
-      scope.min = 0;
-
-      scope.modelArray = scope.$eval(attrs.sfNewArray);
-
-      // We need to have a ngModel to hook into validation. It doesn't really play well with
-      // arrays though so we both need to trigger validation and onChange.
-      // So we watch the value as well. But watching an array can be tricky. We wan't to know
-      // when it changes so we can validate,
-      var watchFn =  function() {
-        //scope.modelArray = modelArray;
-        scope.modelArray = scope.$eval(attrs.sfNewArray);
-        // validateField method is exported by schema-validate
-        if (scope.validateField) {
-          scope.validateField();
-        }
-      };
-
-      var onChangeFn =  function() {
-        if (scope.form && scope.form.onChange) {
-          if (angular.isFunction(form.onChange)) {
-            form.onChange(ctrl.$modelValue, form);
-          } else {
-            scope.evalExpr(form.onChange, {'modelValue': ctrl.$modelValue, form: form});
-          }
-        }
-      };
-
-      // We need the form definition to make a decision on how we should listen.
-      var once = scope.$watch('form', function(form) {
-        if (!form) {
-          return;
-        }
-
-        // Always start with one empty form unless configured otherwise.
-        // Special case: don't do it if form has a titleMap
-        if (!form.titleMap && form.startEmpty !== true && (!scope.modelArray || scope.modelArray.length === 0)) {
-          scope.appendToArray();
-        }
-
-        // If we have "uniqueItems" set to true, we must deep watch for changes.
-        if (scope.form && scope.form.schema && scope.form.schema.uniqueItems === true) {
-          scope.$watch(attrs.sfNewArray, watchFn, true);
-
-          // We still need to trigger onChange though.
-          scope.$watch([attrs.sfNewArray, attrs.sfNewArray + '.length'], onChangeFn);
-
-        } else {
-          // Otherwise we like to check if the instance of the array has changed, or if something
-          // has been added/removed.
-          if (scope.$watchGroup) {
-            scope.$watchGroup([attrs.sfNewArray, attrs.sfNewArray + '.length'], function() {
-              watchFn();
-              onChangeFn();
-            });
-          } else {
-            // Angular 1.2 support
-            scope.$watch(attrs.sfNewArray, function() {
-              watchFn();
-              onChangeFn();
-            });
-            scope.$watch(attrs.sfNewArray + '.length', function() {
-              watchFn();
-              onChangeFn();
-            });
-          }
-        }
-
-        // Title Map handling
-        // If form has a titleMap configured we'd like to enable looping over
-        // titleMap instead of modelArray, this is used for intance in
-        // checkboxes. So instead of variable number of things we like to create
-        // a array value from a subset of values in the titleMap.
-        // The problem here is that ng-model on a checkbox doesn't really map to
-        // a list of values. This is here to fix that.
-        if (form.titleMap && form.titleMap.length > 0) {
-          scope.titleMapValues = [];
-
-          // We watch the model for changes and the titleMapValues to reflect
-          // the modelArray
-          var updateTitleMapValues = function(arr) {
-            scope.titleMapValues = [];
-            arr = arr || [];
-
-            form.titleMap.forEach(function(item) {
-              scope.titleMapValues.push(arr.indexOf(item.value) !== -1);
-            });
-          };
-          //Catch default values
-          updateTitleMapValues(scope.modelArray);
-
-          // TODO: Refactor and see if we can get rid of this watch by piggy backing on the
-          // validation watch.
-          scope.$watchCollection('modelArray', updateTitleMapValues);
-
-          //To get two way binding we also watch our titleMapValues
-          scope.$watchCollection('titleMapValues', function(vals, old) {
-            if (vals && vals !== old) {
-              var arr = scope.modelArray;
-
-              // Apparently the fastest way to clear an array, readable too.
-              // http://jsperf.com/array-destroy/32
-              while (arr.length > 0) {
-                arr.pop();
-              }
-              form.titleMap.forEach(function(item, index) {
-                if (vals[index]) {
-                  arr.push(item.value);
-                }
-              });
-
-              // Time to validate the rebuilt array.
-              // validateField method is exported by schema-validate
-              if (scope.validateField) {
-                scope.validateField();
-              }
-            }
-          });
-        }
-
-        once();
-      });
-
-      scope.appendToArray = function() {
-
-        var empty;
-
-        // Same old add empty things to the array hack :(
-        if (scope.form && scope.form.schema) {
-          if (scope.form.schema.items) {
-            if (scope.form.schema.items.type === 'object') {
-              empty = {};
-            } else if (scope.form.schema.items.type === 'array') {
-              empty = [];
-            }
-          }
-        }
-
-        var model = scope.modelArray;
-        if (!model) {
-          // Create and set an array if needed.
-          var selection = sfPath.parse(attrs.sfNewArray);
-          model = [];
-          sel(selection, scope, model);
-          scope.modelArray = model;
-        }
-        model.push(empty);
-
-        return model;
-      };
-
-      scope.deleteFromArray = function(index) {
-        var model = scope.modelArray;
-        if (model) {
-          model.splice(index, 1);
-        }
-        return model;
-      };
-    }
-  };
 }]);