fix(directives) Add support for subkeys in subschemas for directives

mchapman · mchapman · commit eda59257af18 · 2015-02-04T19:07:08.000Z
diff --git a/js/directives/form.js b/js/directives/form.js
@@ -383,9 +383,7 @@ formsAngular
                   template += '  </div> ';
                 }
 
-                template += '<div class="pull-left">' +
-                              processInstructions(info.schema, false, {subschema: true, formstyle: info.formStyle, model: options.model, subschemaRoot: info.name}) +
-                            '</div>';
+                template += processInstructions(info.schema, false, {subschema: true, formstyle: info.formStyle, model: options.model, subschemaRoot: info.name});
 
                 template += '   </div>' +
                   '</div>';
@@ -502,6 +500,12 @@ formsAngular
                     }
                   }
                 }
+                for (prop in options) {
+                  if (options.hasOwnProperty(prop) && prop[0] !== '$') {
+                    newElement += ' fng-opt-' + prop + '="' + options[prop].toString().replace(/"/g,'&quot;') + '"'; break;
+                  }
+                }
+
                 newElement += '></' + directiveName + '>';
                 result += newElement;
                 callHandleField = false;
diff --git a/js/services/plugin-helper.js b/js/services/plugin-helper.js
@@ -9,31 +9,65 @@ formsAngular.factory('pluginHelper', ['formMarkupHelper',function (formMarkupHel
 
   exports.extractFromAttr = function (attr, directiveName) {
     var info = {};
+    var options = {formStyle: attr.formstyle};
     var directiveOptions = {};
     var directiveNameLength = directiveName.length;
     for (var prop in attr) {
       if (attr.hasOwnProperty(prop)) {
         if (prop.slice(0, 6) === 'fngFld') {
-          info[prop.slice(6).toLowerCase()] = attr[prop].replace(/&quot;/g,'"');
+          info[prop.slice(6).toLowerCase()] = attr[prop].replace(/&quot;/g, '"');
+        } else if (prop.slice(0, 6) === 'fngOpt') {
+          options[prop.slice(6).toLowerCase()] = attr[prop].replace(/&quot;/g,'"');
         } else  if (prop.slice(0,directiveNameLength) === directiveName) {
           directiveOptions[prop.slice(directiveNameLength).toLowerCase()] = attr[prop].replace(/&quot;/g,'"');
         }
       }
     }
-    var options = {formStyle: attr.formstyle};
     return {info: info, options: options, directiveOptions: directiveOptions};
   };
 
   exports.buildInputMarkup = function (scope, model, info, options, addButtons, needsX, generateInputControl) {
     var fieldChrome = formMarkupHelper.fieldChrome(scope, info, options,' id="cg_' + info.id + '"');
     var controlDivClasses = formMarkupHelper.controlDivClasses(options);
     var elementHtml = fieldChrome.template + formMarkupHelper.label(scope, info, addButtons, options);
-    var buildingBlocks;
+    var modelString, idString, nameString;
+
     if (addButtons) {
-      buildingBlocks = formMarkupHelper.allInputsVars(scope, info, options, 'arrayItem' + (needsX ? '.x' : ''), info.id + '_{{$index}}', info.name + '_{{$index}}');
+      modelString = 'arrayItem' + (needsX ? '.x' : '');
+      idString = info.id + '_{{$index}}';
+      nameString =info.name + '_{{$index}}';
     } else {
-      buildingBlocks = formMarkupHelper.allInputsVars(scope, info, options, model + '.' + info.name, info.id, info.name);
+      modelString = model + '.' + info.name;
+      idString = info.id;
+      nameString =info.name;
+    }
+
+    if (options.subschema && info.name.indexOf('.') !== -1) {
+      // Schema handling - need to massage the ngModel and the id
+      var modelBase = model + '.';
+      var compoundName = info.name;
+      var root = options.subschemaroot;
+      var lastPart = compoundName.slice(root.length+1);
+      modelString = modelBase;
+
+      if (options.index) {
+        modelString += root + '[' + options.index + '].' + lastPart;
+        idString = 'f_' + modelString.slice(modelBase.length).replace(/(\.|\[|\]\.)/g, '-');
+      } else {
+        modelString += root;
+        if (options.subkey) {
+          idString = modelString.slice(modelBase.length).replace(/\./g, '-')+'-subkey'+options.subkeyno + '-' + lastPart;
+          modelString += '[' + '$_arrayOffset_' + root.replace(/\./g, '_') + '_' + options.subkeyno + '].' + lastPart;
+        } else {
+          modelString += '[$index].' + lastPart;
+          idString = null;
+          nameString = compoundName.replace(/\./g, '-');
+        }
+      }
     }
+
+    var buildingBlocks = formMarkupHelper.allInputsVars(scope, info, options, modelString, idString, nameString);
+
     elementHtml += formMarkupHelper['handle' + (addButtons ? 'Array' : '') + 'InputAndControlDiv'](
       formMarkupHelper.inputChrome(
         generateInputControl(buildingBlocks),

Original file line number	Diff line number	Diff line change
`@@ -383,9 +383,7 @@ formsAngular`
`383`	`383`	`template += ' </div> ';`
`384`	`384`	`}`
`385`	`385`
`386`		`- template += '<div class="pull-left">' +`
`387`		`- processInstructions(info.schema, false, {subschema: true, formstyle: info.formStyle, model: options.model, subschemaRoot: info.name}) +`
`388`		`- '</div>';`
	`386`	`+ template += processInstructions(info.schema, false, {subschema: true, formstyle: info.formStyle, model: options.model, subschemaRoot: info.name});`
`389`	`387`
`390`	`388`	`template += ' </div>' +`
`391`	`389`	`'</div>';`
`@@ -502,6 +500,12 @@ formsAngular`
`502`	`500`	`}`
`503`	`501`	`}`
`504`	`502`	`}`
	`503`	`+ for (prop in options) {`
	`504`	`+ if (options.hasOwnProperty(prop) && prop[0] !== '$') {`
	`505`	`+ newElement += ' fng-opt-' + prop + '="' + options[prop].toString().replace(/"/g,'"') + '"'; break;`
	`506`	`+ }`
	`507`	`+ }`
	`508`	`+`
`505`	`509`	`newElement += '></' + directiveName + '>';`
`506`	`510`	`result += newElement;`
`507`	`511`	`callHandleField = false;`