Skip to content

Commit e60049d

Browse files
committed
Drop file anywhere to upload joni2back#73
1 parent d85aa2d commit e60049d

File tree

8 files changed

+23
-8
lines changed

8 files changed

+23
-8
lines changed

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"angular-translate": "~2.9.1",
2424
"bootstrap": "~3.3.2",
2525
"jquery": "~2.2.0",
26-
"bootswatch": "3.3.6+1"
26+
"bootswatch": "3.3.6+1",
27+
"ng-file-upload": "^12.0.1"
2728
}
2829
}

bower_components/ng-file-upload/ng-file-upload.min.js

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

index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
<!-- third party -->
1414
<script src="bower_components/angular/angular.min.js"></script>
1515
<script src="bower_components/angular-translate/angular-translate.min.js"></script>
16+
<script src="bower_components/ng-file-upload/ng-file-upload.min.js"></script>
1617
<script src="bower_components/jquery/dist/jquery.min.js"></script>
1718
<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
1819
<link rel="stylesheet" href="bower_components/bootswatch/paper/bootstrap.min.css" />
1920
<!-- /third party -->
2021

21-
<!-- Uncomment if you need to use raw source code
22+
<!-- Uncomment if you need to use raw source code -->
2223
<script src="src/js/app.js"></script>
2324
<script src="src/js/directives/directives.js"></script>
2425
<script src="src/js/filters/filters.js"></script>
@@ -33,12 +34,12 @@
3334
<link href="src/css/animations.css" rel="stylesheet">
3435
<link href="src/css/dialogs.css" rel="stylesheet">
3536
<link href="src/css/main.css" rel="stylesheet">
36-
-->
37+
3738

38-
<!-- Comment if you need to use raw source code -->
39+
<!-- Comment if you need to use raw source code
3940
<link href="dist/angular-filemanager.min.css" rel="stylesheet">
4041
<script src="dist/angular-filemanager.min.js"></script>
41-
<!-- /Comment if you need to use raw source code -->
42+
/Comment if you need to use raw source code -->
4243

4344
<script type="text/javascript">
4445
//example to override angular-filemanager default config

src/css/main.css

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

11+
.upload-dragover {
12+
background-color: #EEEEEE;
13+
}
14+
1115
.navbar {
1216
min-height: 32px;
1317
}

src/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
(function(window, angular, $) {
88
'use strict';
9-
angular.module('FileManagerApp', ['pascalprecht.translate']);
9+
angular.module('FileManagerApp', ['pascalprecht.translate', 'ngFileUpload']);
1010

1111
/**
1212
* jQuery inits

src/js/controllers/main.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,12 @@
165165
}
166166
};
167167

168+
$scope.dropToUploadFiles = function($files) {
169+
$scope.uploadFileList = $scope.uploadFileList.concat($files);
170+
171+
$scope.modal('uploadfile', false);
172+
};
173+
168174
$scope.uploadFiles = function() {
169175
$scope.fileUploader.upload($scope.uploadFileList, $scope.fileNavigator.currentPath).then(function() {
170176
$scope.fileNavigator.refresh();

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">
1+
<div ng-controller="FileManagerCtrl" ngf-drop="dropToUploadFiles($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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ <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-
<input type="file" class="form-control" ng-file="$parent.uploadFileList" autofocus="autofocus" multiple="multiple"/>
250+
<button class="btn btn-default btn-block" ngf-select ng-model="$parent.uploadFileList" ngf-multiple="true">Select files</button>
251251
<div ng-include data-src="'error-bar'" class="clearfix"></div>
252252
</div>
253253
<div class="modal-footer">

0 commit comments

Comments
 (0)