important refactor, using deferreds, etc

Author: joni2back

.gitignore

@@ -1,2 +1,3 @@
 /nbproject/private/
 nbproject/
+node_modules/

README.md

@@ -65,19 +65,21 @@ A very smart filemanager to manage your files in the browser developed in Angula
 ```html
 <!-- Uncomment if you need to use raw source code
   <script src="src/js/app.js"></script>
-  <script src="src/js/config.js"></script>
-  <script src="src/js/chmod.js"></script>
-  <script src="src/js/item.js"></script>
-  <script src="src/js/filenavigator.js"></script>
-  <script src="src/js/fileuploader.js"></script>
-  <script src="src/js/translations.js"></script>
-  <script src="src/js/controller.js"></script>
-  <script src="src/js/selector-controller.js"></script>
-  <link rel="stylesheet" href="src/css/angular-filemanager.css">
+  <script src="src/js/directives/directives.js"></script>
+  <script src="src/js/filters/filters.js"></script>
+  <script src="src/js/providers/config.js"></script>
+  <script src="src/js/entities/chmod.js"></script>
+  <script src="src/js/entities/item.js"></script>
+  <script src="src/js/services/filenavigator.js"></script>
+  <script src="src/js/services/fileuploader.js"></script>
+  <script src="src/js/providers/translations.js"></script>
+  <script src="src/js/controllers/main.js"></script>
+  <script src="src/js/controllers/selector-controller.js"></script>
+  <link href="src/css/angular-filemanager.css" rel="stylesheet">
 -->
 
 <!-- Comment if you need to use raw source code -->
-  <link rel="stylesheet" href="dist/angular-filemanager.css">
+  <link href="dist/angular-filemanager.css" rel="stylesheet">
   <script src="dist/angular-filemanager.min.js"></script>
 <!-- /Comment if you need to use raw source code -->
 ```
@@ -87,15 +89,12 @@ A very smart filemanager to manage your files in the browser developed in Angula
 ### Extending the configuration file
 ```html
 <script type="text/javascript">
-  //example to override angular-filemanager default config
-  angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (fileManagerConfig) {
-    var defaults = fileManagerConfig.$get();
-    fileManagerConfig.set({
-      appName: 'Demo - github.com/joni2back/angular-filemanager',
-      sidebar: false,
+  angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (config) {
+    var defaults = config.$get();
+    config.set({
+      appName: 'github.com/joni2back/angular-filemanager',
       allowedActions: angular.extend(defaults.allowedActions, {
         remove: true
-        copy: false
       })
     });
   }]);

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-filemanager",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "homepage": "https://github.com/joni2back/angular-filemanager",
   "authors": [
     "Jonas Sciangula Street <[email protected]>"

bridges/php/handler.php

@@ -48,6 +48,15 @@ public static function getPost($param = null, $default = null)
         return $_POST;
     }
 
+    public static function getFile($param = null, $default = null)
+    {
+        if ($param) {
+            return isset($_FILES[$param]) ?
+                $_FILES[$param] : $default;
+        }
+        return $_FILES;
+    }
+
     public static function getPostContent() 
     {
         $rawData = file_get_contents('php://input');
@@ -127,29 +136,30 @@ public function getContent($path)
 }
 
 ExceptionCatcherJSON::register();
-
+$oResponse = new Response();
 $oFtp = new FileManager(array(
     'hostname' => '',
     'username' => '',
     'password' => ''
 ));
 
-$oFtp->connect();
-$oResponse = new Response();
+if (! $oFtp->connect()) {
+    throw new Exception("Cannot connect to the FTP server");
+}
 
-if ($_FILES) {
-    $dest = Request::getPost('destination');
+if (Request::getFile() && $dest = Request::getPost('destination')) {
     $errors = array();
-    foreach ($_FILES as $file) {
+    foreach (Request::getFile() as $file) {
         $filePath = $file['tmp_name'];
         $destPath = $dest .'/'. $file['name'];
         $result = $oFtp->upload($filePath, $destPath);
         if (! $result)  {
             $errors[] = $file['name'];
         }
     }
+    
     if ($errors) {
-        throw new Exception("Unknown error uploading: " . "\n" . implode($errors, ", \n"));
+        throw new Exception("Unknown error uploading: \n\n" . implode(", \n", $errors));
     }
 
     $oResponse->setData($result);
@@ -199,7 +209,7 @@ public function getContent($path)
         $oResponse->setData($fileContent);
         $oResponse->setHeaders(array(
             'Content-Type' => @mime_content_type($tmpFilePath),
-            'Content-disposition' => "$download filename=$fileName"
+            'Content-disposition' => sprintf('%s filename="%s"', $download, $fileName)
         ));
     }
     $oResponse->flush();

dist/angular-filemanager.min.js

@@ -32,7 +32,8 @@ gulp.task('cache-templates', function () {
 
 gulp.task('concat-uglify-js', ['clean', 'cache-templates'], function() {
   return gulp.src([
-      src + 'js/*.js',
+    src + 'js/app.js',
+      src + 'js/*/*.js',
       dst + '/' + jsFile
     ])
     .pipe(concat(jsFile))

gulpfile.js

@@ -2,7 +2,7 @@
 <html lang="en" data-ng-app="FileManagerApp">
 <head>
   <!--
-    * Angular FileManager v1.3.1 (https://github.com/joni2back/angular-filemanager)
+    * Angular FileManager v1.4.0 (https://github.com/joni2back/angular-filemanager)
     * Jonas Sciangula Street <[email protected]>
     * Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
   -->
@@ -21,39 +21,48 @@
 
   <!-- Uncomment if you need to use raw source code
     <script src="src/js/app.js"></script>
-    <script src="src/js/config.js"></script>
-    <script src="src/js/chmod.js"></script>
-    <script src="src/js/item.js"></script>
-    <script src="src/js/filenavigator.js"></script>
-    <script src="src/js/fileuploader.js"></script>
-    <script src="src/js/translations.js"></script>
-    <script src="src/js/controller.js"></script>
-    <script src="src/js/selector-controller.js"></script>
-    <link rel="stylesheet" href="src/css/angular-filemanager.css">
+    <script src="src/js/directives/directives.js"></script>
+    <script src="src/js/filters/filters.js"></script>
+    <script src="src/js/providers/config.js"></script>
+    <script src="src/js/entities/chmod.js"></script>
+    <script src="src/js/entities/item.js"></script>
+    <script src="src/js/services/filenavigator.js"></script>
+    <script src="src/js/services/fileuploader.js"></script>
+    <script src="src/js/providers/translations.js"></script>
+    <script src="src/js/controllers/main.js"></script>
+    <script src="src/js/controllers/selector-controller.js"></script>
+    <link href="src/css/angular-filemanager.css" rel="stylesheet">
   -->
 
   <!-- Comment if you need to use raw source code -->
-    <link rel="stylesheet" href="dist/angular-filemanager.css">
+    <link href="dist/angular-filemanager.css" rel="stylesheet">
     <script src="dist/angular-filemanager.min.js"></script>
   <!-- /Comment if you need to use raw source code -->
 
   <script type="text/javascript">
     //example to override angular-filemanager default config
-    angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (fileManagerConfig) {
-      var defaults = fileManagerConfig.$get();
-
-      fileManagerConfig.set({
-        appName: 'Demo - github.com/joni2back/angular-filemanager',
+    angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (config) {
+      var defaults = config.$get();
+      config.set({
+        appName: 'github.com/joni2back/angular-filemanager',
         allowedActions: angular.extend(defaults.allowedActions, {
           remove: true
         })
       });
-
     }]);
   </script>
 </head>
 
 <body class="ng-cloak">
   <angular-filemanager></angular-filemanager>
+
+  <script> 
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-35182652-1', 'auto');
+    ga('send', 'pageview');
+  </script>
 </body>
 </html>

index.html

@@ -1,6 +1,6 @@
 {
   "name": "angular-filemanager",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A very smart filemanager to manage your files in the browser.",
   "main": "src/app.js",
   "scripts": {

package.json

@@ -1,5 +1,5 @@
 /*!
- * Angular FileManager v1.3.1 (https://github.com/joni2back/angular-filemanager)
+ * Angular FileManager v1.4.0 (https://github.com/joni2back/angular-filemanager)
  * Jonas Sciangula Street <[email protected]>
  * Licensed under MIT (https://github.com/joni2back/angular-filemanager/blob/master/LICENSE)
  */
@@ -8,76 +8,20 @@
     "use strict";
     var app = angular.module('FileManagerApp', ['pascalprecht.translate', 'ngCookies']);
 
-    app.directive('angularFilemanager', ['$parse', 'fileManagerConfig', function($parse, fileManagerConfig) {
-        return {
-            restrict: 'EA',
-            templateUrl: fileManagerConfig.tplPath + '/index.html'
-        };
-    }]);
-
-    app.directive('ngFile', ['$parse', function($parse) {
-        return {
-            restrict: 'A',
-            link: function(scope, element, attrs) {
-                var model = $parse(attrs.ngFile);
-                var modelSetter = model.assign;
-
-                element.bind('change', function() {
-                    scope.$apply(function() {
-                        modelSetter(scope, element[0].files);
-                    });
-                });
-            }
-        };
-    }]);
-
-    app.directive('ngRightClick', ['$parse', function($parse) {
-        return function(scope, element, attrs) {
-            var fn = $parse(attrs.ngRightClick);
-            element.bind('contextmenu', function(event) {
-                scope.$apply(function() {
-                    event.preventDefault();
-                    fn(scope, {$event: event});
-                });
-            });
-        };
-    }]);
-
-    app.filter('strLimit', ['$filter', function($filter) {
-        return function(input, limit) {
-            if (input.length <= limit) {
-                return input;
-            }
-            return $filter('limitTo')(input, limit) + '...';
-        };
-    }]);
-
-    app.filter('formatDate', ['$filter', function($filter) {
-        return function(input, limit) {
-            return input instanceof Date ?
-                input.toISOString().substring(0, 19).replace('T', ' ') :
-                (input.toLocaleString || input.toString).apply(input);
-        };
-    }]);
-
     /**
      * jQuery inits
      */
-    var menuSelectors = '.main-navigation .table-files td:first-child, .iconset a.thumbnail';
-
     $(window.document).on('shown.bs.modal', '.modal', function() {
-        var self = this;
-        var timer = setTimeout(function() {
-            $('[autofocus]', self).focus();
-            timer && clearTimeout(timer);
-        }, 100);
+        setTimeout(function() {
+            $('[autofocus]', this).focus();
+        }.bind(this), 100);
     });
 
     $(window.document).on('click', function() {
         $("#context-menu").hide();
     });
 
-    $(window.document).on('contextmenu', menuSelectors, function(e) {
+    $(window.document).on('contextmenu', '.main-navigation .table-files td:first-child, .iconset a.thumbnail', function(e) {
         $("#context-menu").hide().css({
             left: e.pageX,
             top: e.pageY