fix(general) Sort out problems typsescript highlighted

mchapman · mchapman · commit 22a644cd2d0a · 2015-10-15T14:31:16.000+01:00
diff --git a/js/fng-types.ts b/js/fng-types.ts
@@ -26,6 +26,7 @@ module fng {
     decorateScope($scope:fng.IFormScope, $modal, recordHandlerInstance : fng.IRecordHandler, ctrlState);
     fillFormFromBackendCustomSchema(schema, $scope:fng.IFormScope, formGeneratorInstance, recordHandlerInstance, ctrlState);
     fillFormWithBackendSchema($scope: fng.IFormScope, formGeneratorInstance, recordHandlerInstance, ctrlState);
+    handleError($scope: fng.IFormScope);
   }
 
   export interface IFormGenerator {
@@ -131,7 +132,9 @@ module fng {
   export interface IFormOptions extends IBaseFormOptions {
     schema? : string;
     subkey?: string;
+    subkeyno?: number;
     subschema? : string;
+    subschemaroot? : string;
   }
 
   export interface IBuiltInRoute {
diff --git a/js/services/form-generator.ts b/js/services/form-generator.ts
@@ -12,6 +12,9 @@ module fng.services {
    */
 
   /*@ngInject*/
+  import IFormController = angular.IFormController;
+
+
   export function formGenerator($location, $timeout, $filter, SubmissionsService, routingService, recordHandler) : IFormGenerator {
 
     function handleSchema(description, source, destForm, destList, prefix, doRecursion, $scope, ctrlState) {
@@ -693,7 +696,7 @@ module fng.services {
 
         $scope.setFormDirty = function (event) {
           if (event) {
-            var form = angular.element(event.target).inheritedData('$formController');
+            var form:any = angular.element(event.target).inheritedData('$formController');
             form.$setDirty();
           } else {
             console.log('setFormDirty called without an event (fine in a unit test)');
@@ -734,4 +737,7 @@ module fng.services {
       }
     };
   }
-}
+
+  formGenerator.$inject = ["$location", "$timeout", "$filter", "SubmissionsService", "routingService", "recordHandler"];
+
+  }
