fix(form) Slight improvements when passing attributes to directives

mchapman · mchapman · commit c528edf15eb9 · 2017-10-10T15:40:52.000+01:00
diff --git a/dist/forms-angular.js b/dist/forms-angular.js
@@ -2410,8 +2410,10 @@ var fng;
                     if (cssFrameworkService.framework() === 'bs3' && isHorizontalStyle(options.formstyle) && fieldInfo.type !== 'checkbox') {
                         value = '<div class="bs3-input ' + markupVars.sizeClassBS3 + '">' + value + '</div>';
                     }
-                    if (fieldInfo.helpInline) {
-                        value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + fieldInfo.helpInline + '</span>';
+                    // Hack to cope with inline help in directives
+                    var inlineHelp = (fieldInfo.helpInline || '') + (fieldInfo.helpinline || '');
+                    if (inlineHelp.length > 0) {
+                        value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + inlineHelp + '</span>';
                     }
                     // If we have chosen
                     value += '<div ng-if="' + (options.name || 'myForm') + '.' + fieldInfo.id + '.$dirty" class="help-block">' +
@@ -2538,7 +2540,7 @@ var fng;
                                 options[prop.slice(6).toLowerCase()] = deserialize(attr[prop]);
                             }
                             else if (directiveName && prop.slice(0, directiveNameLength) === directiveName) {
-                                directiveOptions[prop.slice(directiveNameLength).toLowerCase()] = deserialize(attr[prop]);
+                                directiveOptions[_.kebabCase(prop.slice(directiveNameLength))] = deserialize(attr[prop]);
                             }
                         }
                     }
diff --git a/dist/forms-angular.min.js b/dist/forms-angular.min.js
diff --git a/js/services/form-markup-helper.ts b/js/services/form-markup-helper.ts
@@ -170,8 +170,10 @@ module fng.services {
           if (cssFrameworkService.framework() === 'bs3' && isHorizontalStyle(options.formstyle) && fieldInfo.type !== 'checkbox') {
             value = '<div class="bs3-input ' + markupVars.sizeClassBS3 + '">' + value + '</div>';
           }
-          if (fieldInfo.helpInline) {
-            value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + fieldInfo.helpInline + '</span>';
+          // Hack to cope with inline help in directives
+          var inlineHelp = (fieldInfo.helpInline || '') + (fieldInfo.helpinline || '');
+          if (inlineHelp.length > 0) {
+            value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + inlineHelp + '</span>';
           }
           // If we have chosen
           value +=  '<div ng-if="' + (options.name || 'myForm') + '.' + fieldInfo.id + '.$dirty" class="help-block">' +
diff --git a/js/services/plugin-helper.ts b/js/services/plugin-helper.ts
@@ -33,7 +33,7 @@ module fng.services {
             } else if (prop.slice(0, 6) === 'fngOpt') {
               options[prop.slice(6).toLowerCase()] = deserialize(attr[prop]);
             } else if (directiveName && prop.slice(0, directiveNameLength) === directiveName) {
-              directiveOptions[prop.slice(directiveNameLength).toLowerCase()] = deserialize(attr[prop]);
+              directiveOptions[_.kebabCase(prop.slice(directiveNameLength))] = deserialize(attr[prop]);
             }
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -2410,8 +2410,10 @@ var fng;`
`2410`	`2410`	`if (cssFrameworkService.framework() === 'bs3' && isHorizontalStyle(options.formstyle) && fieldInfo.type !== 'checkbox') {`
`2411`	`2411`	`value = '<div class="bs3-input ' + markupVars.sizeClassBS3 + '">' + value + '</div>';`
`2412`	`2412`	`}`
`2413`		`- if (fieldInfo.helpInline) {`
`2414`		`- value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + fieldInfo.helpInline + '</span>';`
	`2413`	`+ // Hack to cope with inline help in directives`
	`2414`	`+ var inlineHelp = (fieldInfo.helpInline \|\| '') + (fieldInfo.helpinline \|\| '');`
	`2415`	`+ if (inlineHelp.length > 0) {`
	`2416`	`+ value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + inlineHelp + '</span>';`
`2415`	`2417`	`}`
`2416`	`2418`	`// If we have chosen`
`2417`	`2419`	`value += '<div ng-if="' + (options.name \|\| 'myForm') + '.' + fieldInfo.id + '.$dirty" class="help-block">' +`
`@@ -2538,7 +2540,7 @@ var fng;`
`2538`	`2540`	`options[prop.slice(6).toLowerCase()] = deserialize(attr[prop]);`
`2539`	`2541`	`}`
`2540`	`2542`	`else if (directiveName && prop.slice(0, directiveNameLength) === directiveName) {`
`2541`		`- directiveOptions[prop.slice(directiveNameLength).toLowerCase()] = deserialize(attr[prop]);`
	`2543`	`+ directiveOptions[_.kebabCase(prop.slice(directiveNameLength))] = deserialize(attr[prop]);`
`2542`	`2544`	`}`
`2543`	`2545`	`}`
`2544`	`2546`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,10 @@ module fng.services {`
`170`	`170`	`if (cssFrameworkService.framework() === 'bs3' && isHorizontalStyle(options.formstyle) && fieldInfo.type !== 'checkbox') {`
`171`	`171`	`value = '<div class="bs3-input ' + markupVars.sizeClassBS3 + '">' + value + '</div>';`
`172`	`172`	`}`
`173`		`- if (fieldInfo.helpInline) {`
`174`		`- value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + fieldInfo.helpInline + '</span>';`
	`173`	`+ // Hack to cope with inline help in directives`
	`174`	`+ var inlineHelp = (fieldInfo.helpInline \|\| '') + (fieldInfo.helpinline \|\| '');`
	`175`	`+ if (inlineHelp.length > 0) {`
	`176`	`+ value += '<span class="' + (cssFrameworkService.framework() === 'bs2' ? 'help-inline' : 'help-block') + '">' + inlineHelp + '</span>';`
`175`	`177`	`}`
`176`	`178`	`// If we have chosen`
`177`	`179`	`value += '<div ng-if="' + (options.name \|\| 'myForm') + '.' + fieldInfo.id + '.$dirty" class="help-block">' +`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ module fng.services {`
`33`	`33`	`} else if (prop.slice(0, 6) === 'fngOpt') {`
`34`	`34`	`options[prop.slice(6).toLowerCase()] = deserialize(attr[prop]);`
`35`	`35`	`} else if (directiveName && prop.slice(0, directiveNameLength) === directiveName) {`
`36`		`- directiveOptions[prop.slice(directiveNameLength).toLowerCase()] = deserialize(attr[prop]);`
	`36`	`+ directiveOptions[_.kebabCase(prop.slice(directiveNameLength))] = deserialize(attr[prop]);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`