Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ angular
'md.data.table',
'ngIdle',
'ngclipboard',
'ngFileUpload',
])
.service('JWTHttpInterceptor', function () {
return {
Expand Down
18 changes: 15 additions & 3 deletions app/scripts/controllers/Files.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,22 @@ function DialogUploadController($scope, $mdDialog, Backend, $shared, onFinished)
$scope.error = false;
$scope.errorText = "";
$scope.data = {
file: null
file: null,
files: []
};
$scope.onFilesChanged = function(files, invalidFiles) {
if (invalidFiles && invalidFiles.length > 0) {
$scope.errorText = "Some files are invalid. Please use .webp or .mp3 files only.";
return;
}
$scope.errorText = "";
$scope.data.files = files || [];
};
$scope.submit = function($event) {
var files = angular.element("#uploadFile").prop("files");
var files = $scope.data.files;
if (!files || files.length === 0) {
files = angular.element("#uploadFile").prop("files");
}
if ( files.length === 0 ) {
$scope.errorText="Please select atleast 1 file..";
return;
Expand All @@ -107,7 +119,7 @@ function DialogUploadController($scope, $mdDialog, Backend, $shared, onFinished)
}
$scope.close = function() {
$mdDialog.hide();
}
};
}


Expand Down
27 changes: 26 additions & 1 deletion app/views/dialogs/upload-addfile.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,33 @@ <h2>Upload File</h2>
</md-toolbar>
<md-dialog-content class="padding16">
<label for="uploadFile" class="choose-file">
<input type="file" id="uploadFile" accept=".webp,.mp3"/>
<input
type="file"
id="uploadFile"
accept=".webp,.mp3,.wav"
ngf-select
ngf-change="onFilesChanged($files, $invalidFiles)"
ngf-pattern="'.webp,.mp3,.wav'"
ngf-accept="'.webp,.mp3,.wav'"
multiple
/>
</label>
<div
ngf-drop
ngf-change="onFilesChanged($files, $invalidFiles)"
ngf-pattern="'.webp,.mp3,.wav'"
ngf-accept="'.webp,.mp3,.wav'"
ngf-multiple="true"
ngf-drag-over-class="'drag-over'"
class="upload-drop-zone"
style="margin-top:12px;border:2px dashed #3f51b5;border-radius:10px;padding:14px;text-align:center;color:#3f51b5;background:#f7f9ff;height: 100px;padding-top: 35px;"
>
Drag and drop file(s) here
</div>
<div ng-if="data.files && data.files.length" style="margin-top:8px;font-size:13px;color:#222;">
Selected: {{data.files[0].name}}<span ng-if="data.files.length > 1"> +{{data.files.length - 1}} more</span>
</div>
<div ng-if="errorText" style="margin-top:8px;color:#d32f2f;font-size:13px;">{{errorText}}</div>
</md-dialog-content>
<md-dialog-actions layout="row">
<md-button class="md-raised md-primary m0" ng-click="submit()">
Expand Down
1 change: 1 addition & 0 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"angular-material-data-table": "^0.10.10",
"nickel.minStrength": "*",
"ng-idle": "^1.3.2",
"ng-file-upload": "^12.2.13",
"flag-css": "0.0.11",
"flag-icon-css": "^3.4.5",
"moment": "^2.24.0",
Expand Down
2 changes: 2 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ var deps = [
"./bower_components/angular-material-data-table/dist/md-data-table.js",
"./bower_components/zxcvbn/dist/zxcvbn.js",
"./bower_components/ng-idle/angular-idle.js",
'./bower_components/ng-file-upload/ng-file-upload.js',
'./bower_components/urijs/src/URI.min.js',
];
var files = [
Expand Down Expand Up @@ -319,6 +320,7 @@ gulp.task('compress-js', ['scripts'], function() {
'./bower_components/angular-material-data-table/dist/md-data-table.js',
'./bower_components/zxcvbn/dist/zxcvbn.js',
'./bower_components/ng-idle/angular-idle.js',
'./bower_components/ng-file-upload/ng-file-upload.js',
'./bower_components/moment/moment.js',
'./bower_components/clipboard/dist/clipboard.js',
'./bower_components/ngclipboard/dist/ngclipboard.js',
Expand Down
Loading