summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/directives/file-upload
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-07-29 16:13:45 +0300
committerMichael Lando <ml636r@att.com>2018-07-29 16:20:34 +0300
commit5b593496b8f1b8e8be8d7d2dbcc223332e65a49b (patch)
tree2f9dfc45191e723da69cf74be7829784e9741b94 /catalog-ui/src/app/directives/file-upload
parent9200382f2ce7b4bb729aa287d0878004b2d2b4f9 (diff)
re base code
Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-ui/src/app/directives/file-upload')
-rw-r--r--catalog-ui/src/app/directives/file-upload/file-upload.ts11
1 files changed, 6 insertions, 5 deletions
diff --git a/catalog-ui/src/app/directives/file-upload/file-upload.ts b/catalog-ui/src/app/directives/file-upload/file-upload.ts
index 4902741927..7d6667cbcc 100644
--- a/catalog-ui/src/app/directives/file-upload/file-upload.ts
+++ b/catalog-ui/src/app/directives/file-upload/file-upload.ts
@@ -94,13 +94,13 @@ export class FileUploadDirective implements ng.IDirective {
};
scope.onFileChange = ():void => {
+ if (scope.myFileModel || scope.fileModel) {
+ scope.fileModel = scope.myFileModel;
+ scope.formElement[scope.elementName].value = scope.myFileModel;
+ }
if (scope.onFileChangedInDirective) {
scope.onFileChangedInDirective();
}
- if (scope.myFileModel) {
- scope.fileModel = scope.myFileModel;
- scope.formElement[scope.elementName].$setValidity('required', true);
- }
};
scope.setEmptyError = (element):void => {
@@ -136,9 +136,10 @@ export class FileUploadDirective implements ng.IDirective {
};
scope.cancel = ():void => {
- scope.fileModel.filename = '';
+ scope.myFileModel = new FileUploadModel();
scope.formElement[scope.elementName].$pristine;
scope.formElement[scope.elementName].$setValidity('required', false);
+ scope.onFileChange();
}
};