Skip to content

Commit a383de5

Browse files
committed
Drop file anywhere to upload joni2back#73
1 parent 01d3bf8 commit a383de5

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

src/css/main.css

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ body {
88
outline: 0!important;
99
}
1010

11-
.upload-dragover {
12-
background-color: #EEEEEE;
13-
}
14-
1511
.navbar {
1612
min-height: 32px;
1713
margin-bottom: 0;
@@ -223,6 +219,14 @@ a:hover {
223219
margin: 3px 0;
224220
}
225221

222+
.upload-dragover {
223+
background-color: #EEEEEE;
224+
}
225+
226+
.upload-list {
227+
margin-top: 20px;
228+
}
229+
226230
.spinner-wrapper {
227231
margin: 0 auto;
228232
text-align: center;

src/js/controllers/main.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,16 @@
165165
}
166166
};
167167

168-
$scope.dropToUploadFiles = function($files) {
168+
$scope.addForUpload = function($files) {
169169
$scope.uploadFileList = $scope.uploadFileList.concat($files);
170170

171171
$scope.modal('uploadfile', false);
172172
};
173173

174+
$scope.removeFromUpload = function(index) {
175+
$scope.uploadFileList.splice(index, 1);
176+
};
177+
174178
$scope.uploadFiles = function() {
175179
$scope.fileUploader.upload($scope.uploadFileList, $scope.fileNavigator.currentPath).then(function() {
176180
$scope.fileNavigator.refresh();

src/js/services/fileuploader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
form.append('destination', '/' + path.join('/'));
3030

3131
for (var i = 0; i < fileList.length; i++) {
32-
var fileObj = fileList.item(i);
32+
var fileObj = fileList[i];
3333
fileObj instanceof window.File && form.append('file-' + i, fileObj);
3434
}
3535

src/templates/main.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div ng-controller="FileManagerCtrl" ngf-drop="dropToUploadFiles($files)" ngf-drag-over-class="'upload-dragover'" ngf-multiple="true">
1+
<div ng-controller="FileManagerCtrl" ngf-drop="addForUpload($files)" ngf-drag-over-class="'upload-dragover'" ngf-multiple="true">
22
<div ng-include="config.tplPath + '/navbar.html'"></div>
33

44
<div class="container-fluid">

src/templates/modals.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,18 @@ <h4 class="modal-title">{{"upload_file" | translate}}</h4>
247247
</div>
248248
<div class="modal-body">
249249
<label class="radio">{{"files_will_uploaded_to" | translate}} <b>{{fileNavigator.currentPath.join('/')}}</b></label>
250-
<button class="btn btn-default btn-block" ngf-select ng-model="$parent.uploadFileList" ngf-multiple="true">Select files</button>
250+
<button class="btn btn-default btn-block" ngf-select="$parent.addForUpload($files)" ngf-multiple="true">Select files</button>
251+
252+
<div class="upload-list">
253+
<ul class="list-group">
254+
<li class="list-group-item" ng-repeat="(index, uploadFile) in $parent.uploadFileList">
255+
<button class="btn btn-sm btn-danger pull-right" ng-click="$parent.removeFromUpload(index)"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span><span class="sr-only">{{"remove" | translate}}</span></button>
256+
<h5 class="list-group-item-heading">{{uploadFile.name}}</h5>
257+
<p class="list-group-item-text">{{uploadFile.size | humanReadableFileSize}}</p>
258+
</li>
259+
</ul>
260+
</div>
261+
251262
<div ng-include data-src="'error-bar'" class="clearfix"></div>
252263
</div>
253264
<div class="modal-footer">

0 commit comments

Comments
 (0)