Merge branch 'durasj-file-upload-v2' into click-changes

Author: joni2back

README.md

@@ -13,9 +13,10 @@ This project is under free license. If you want to support the angular-filemanag
 ![](https://raw.githubusercontent.com/joni2back/angular-filemanager/click-changes/screenshot.gif)
 
 ### Features
-  - Multilanguage (English / Spanish / Portuguese / French / German)
+  - Multilanguage (English / 简体中文 / Spanish / Portuguese / French / German / Slovak / Hebrew)
   - Multiple templates (List / Icons)
   - Multiple file upload
+  - Multiple file support
   - Search files
   - Directory tree navigation
   - Copy, Move, Rename (Interactive UX)
@@ -24,8 +25,6 @@ This project is under free license. If you want to support the angular-filemanag
   - Mobile support
 
 ### TODO
-  - Improve the docs
-  - Multiple file selector
   - Drag and drop
   - Dropbox and Google Drive compatibility
   - Extend backend bridges (PHP, Java, Python, Node, .Net)
@@ -97,7 +96,7 @@ This project is under free license. If you want to support the angular-filemanag
     config.set({
       appName: 'my angular-filemanager',
       allowedActions: angular.extend(defaults.allowedActions, {
-        remove: true
+        remove: false
       })
     });
   }]);
@@ -115,3 +114,5 @@ For transparency into our release cycle and in striving to maintain backward com
 
 ### Copyright and license
 Code and documentation released under [the MIT license](https://github.com/joni2back/angular-filemanager/blob/master/LICENSE).
+
+

bower.json

@@ -23,6 +23,7 @@
     "angular-translate": "~2.9.1",
     "bootstrap": "~3.3.2",
     "jquery": "~2.2.0",
-    "bootswatch": "3.3.6+1"
+    "bootswatch": "3.3.6+1",
+    "ng-file-upload": "^12.0.1"
   }
 }

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

@@ -0,0 +1,18 @@
+{
+	"function_not_implemented": "Fonction non implémentée",
+	"file_not_found": "Fichier non trouvé",
+	"listing_filed": "Le listing a échoué",
+	"moving_failed": "Le déplacement a échoué",
+	"renaming_failed": "Le renommage a échoué",
+	"copying_failed": "La copie a échouée",
+	"removing_failed": "La suppression a échouée",
+	"removing_failed_directory_not_empty": "La suppression a échouée, le répertoire que vous voulez supprimer n'est pas vide",
+	"saving_failed": "L'enregistrement a échoué",
+	"folder_already_exists": "Le répertoire existe déjà",
+	"folder_creation_failed": "La création du répertoire a échoué",
+	"permissions_change_failed": "Le changement de permission a échoué",
+	"compression_failed": "La compression a échouée",
+	"archive_opening_failed": "L'ouverture de l'archive est impossible, le fichier est corrompu ou non supporté",
+	"extraction_failed": "L'extraction a échouée",
+	"upload_failed": "L'upload a échoué"
+}

bridges/php-local/lang/fr.json

@@ -13,6 +13,7 @@
   <!-- third party -->
     <script src="bower_components/angular/angular.min.js"></script>
     <script src="bower_components/angular-translate/angular-translate.min.js"></script>
+    <script src="bower_components/ng-file-upload/ng-file-upload.min.js"></script>
     <script src="bower_components/jquery/dist/jquery.min.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
     <link rel="stylesheet" href="bower_components/bootswatch/paper/bootstrap.min.css" />

dist/angular-filemanager.min.css

@@ -166,6 +166,7 @@ textarea.code {
   padding: 0;
   padding: 10px 0;
   border: none;
+  background: none;
 }
 
 .table-files .selected,
@@ -235,6 +236,26 @@ textarea.code {
   margin: 3px 0;
 }
 
+.upload-dragover .main {
+  opacity: .4;
+}
+
+.upload-dragover:before {
+  content: "\e198";
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 100;
+  color: #2196F3;
+  font-size: 8em;
+  font-family: 'Glyphicons Halflings';
+}
+
+.upload-list {
+  margin-top: 20px;
+}
+
 .spinner-wrapper {
   margin: 0 auto;
   text-align: center;
@@ -345,4 +366,4 @@ table th > a:focus {
 
 .selected-file-details {
   padding-left: 20px;
-}
+}

dist/angular-filemanager.min.js

@@ -1,6 +1,6 @@
 (function(window, angular, $) {
     'use strict';
-    angular.module('FileManagerApp', ['pascalprecht.translate']);
+    angular.module('FileManagerApp', ['pascalprecht.translate', 'ngFileUpload']);
 
     /**
      * jQuery inits
@@ -16,7 +16,16 @@
     });
 
     $(window.document).on('contextmenu', '.main-navigation .table-files tr.item-list:has("td"), .item-list', function(e) {
-        $('#context-menu').hide().css({
+        var menu = $('#context-menu');
+
+        if (e.pageX >= window.innerWidth - menu.width()) {
+            e.pageX -= menu.width();
+        }
+        if (e.pageY >= window.innerHeight - menu.height()) {
+            e.pageY -= menu.height();
+        }
+
+        menu.hide().css({
             left: e.pageX,
             top: e.pageY
         }).show();

index.html

@@ -308,9 +308,19 @@
             });
         };
 
+        $scope.addForUpload = function($files) {
+            $scope.uploadFileList = $scope.uploadFileList.concat($files);
+            $scope.modal('uploadfile');
+        };
+
+        $scope.removeFromUpload = function(index) {
+            $scope.uploadFileList.splice(index, 1);
+        };
+
         $scope.uploadFiles = function() {
             $scope.apiMiddleware.upload($scope.uploadFileList, $scope.fileNavigator.currentPath).then(function() {
                 $scope.fileNavigator.refresh();
+                $scope.uploadFileList = [];
                 $scope.modal('uploadfile', true);
             }, function(data) {
                 var errorMsg = data.result && data.result.error || $translate.instant('error_uploading_files');