Skip to content

Commit 4074dcb

Browse files
committed
Preview Arquivo não Image
1 parent 0677886 commit 4074dcb

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

dist/lets.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/controllers/lets-crud-edit.controller.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,16 @@
5050
$scope.parseData(data);
5151

5252
$timeout(function(){
53+
$scope.$emit(_events.edit);
5354
$scope.$broadcast('setProgressFile');
5455
});
55-
56-
$scope.$emit(_events.edit);
56+
5757
});
5858
} else {
59-
6059
$timeout(function () {
6160
$scope.$emit(_events.new);
61+
$scope.$broadcast('setProgressFile');
6262
}, 50);
63-
6463
}
6564
};
6665

src/directives/framework/lets-fw-upload.directive.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
STORAGE_URL +=$scope.field.customOptions.file.container+"/";
2222
}
2323

24+
$scope.isFileImage = function(filename){
25+
return !!filename.match(/.(jpg|jpeg|png|gif)$/i)
26+
}
27+
2428
$scope.trustSrc = function (src) {
2529
return $sce.trustAsResourceUrl(src);
2630
};
@@ -30,9 +34,9 @@
3034
$scope.f = {
3135
name:$scope.data[$scope.field.name],
3236
progress:100,
33-
alreadySent:true
37+
alreadySent:true,
38+
isImage:$scope.isFileImage($scope.data[$scope.field.name])
3439
};
35-
3640
$scope.f.fileURL = STORAGE_URL+$scope.f.name;
3741
}
3842
});
@@ -68,6 +72,7 @@
6872
$scope.f.uploading = false;
6973
$scope.f.name = response.data.result.files.file[0].name;
7074
$scope.f.fileURL = STORAGE_URL+$scope.f.name;
75+
$scope.f.isImage = $scope.isFileImage($scope.f.name)
7176
_input.controller('ngModel').$setViewValue($scope.f.name);
7277
});
7378

src/views/framework/input.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
justify-content: center;
141141
">
142142
<img
143-
ng-if="field.customOptions.file.preview && f.fileURL"
143+
ng-if="field.customOptions.file.preview && f.fileURL && f.isImage"
144144
style="max-height:100%; max-width:100%; border-radius: 5px;"
145145
ng-src="{{ trustSrc(f.fileURL) }}">
146146

@@ -154,13 +154,13 @@
154154
ngf-select="upload($file, $invalidFiles)">Arraste e solte o arquivo aqui.
155155
</div>
156156

157-
<div ng-if="field.customOptions.file.dad && f.alreadySent && !field.customOptions.file.preview">
157+
<div ng-if="field.customOptions.file.dad && f.alreadySent && (!field.customOptions.file.preview || !f.isImage)">
158158
<i class="fa fa-file-text-o" style="font-size:85px"></i>
159159
</div>
160160

161161
</div>
162162
<div style="display: flex;">
163-
<div class="progress">
163+
<div class="progress" style="margin-bottom: 0px;">
164164
<div
165165
class="progress-bar"
166166
role="progressbar"

0 commit comments

Comments
 (0)