Merge pull request joni2back#1 from joni2back/master

Merge

Author: liul

README.md

@@ -112,7 +112,7 @@ angular.module('FileManagerApp').config(['fileManagerConfigProvider', function (
 </script>
 ```
 
-You can do many things by extending the configuration. Like hide the sidebar or the search button. See [/src/js/providers/config.js](You can see the list of default configurations).
+You can do many things by extending the configuration. Like hide the sidebar or the search button. See [the list of default configurations](/src/js/providers/config.js).
 
 ---------
 

bridges/php/handler.php

@@ -274,6 +274,13 @@ public function getContent($path)
     $fileName = explode('/', $filePath);
     $fileName = end($fileName);
     $tmpFilePath = $oFtp->downloadTemp($filePath);
+
+    @register_shutdown_function(function() use ($tmpFilePath) {
+        if (file_exists($tmpFilePath)) {
+            @unlink($tmpFilePath);
+        }
+    });
+
     if ($fileContent = @file_get_contents($tmpFilePath)) {
         $oResponse->setData($fileContent);
         $oResponse->setHeaders(array(
@@ -304,4 +311,4 @@ public function getContent($path)
     $oResponse->flush();
 }
 
-throw new \Exception('This action is not available in the demo');
+throw new \Exception('This action is not available in the demo');

dist/angular-filemanager.min.js

@@ -20,6 +20,7 @@
             compressUrl: 'bridges/php/handler.php',
             extractUrl: 'bridges/php/handler.php',
             permissionsUrl: 'bridges/php/handler.php',
+            basePath: '/',
 
             searchForm: true,
             sidebar: true,
@@ -44,6 +45,7 @@
             },
 
             multipleDownloadFileName: 'angular-filemanager.zip',
+            filterFileExtensions: [],
             showExtensionIcons: true,
             showSizeForDirectories: false,
             useBinarySizePrefixes: false,

src/js/providers/config.js

@@ -33,13 +33,14 @@
             return deferred.resolve(data);
         };
 
-        ApiHandler.prototype.list = function(apiUrl, path, customDeferredHandler) {
+        ApiHandler.prototype.list = function(apiUrl, path, customDeferredHandler, exts) {
             var self = this;
             var dfHandler = customDeferredHandler || self.deferredHandler;
             var deferred = $q.defer();
             var data = {
                 action: 'list',
-                path: path
+                path: path,
+                fileExtensions: exts && exts.length ? exts : undefined
             };
 
             self.inprocess = true;

src/js/services/apihandler.js

@@ -7,13 +7,18 @@
             this.apiMiddleware = new ApiMiddleware();
             this.requesting = false;
             this.fileList = [];
-            this.currentPath = [];
+            this.currentPath = this.getBasePath();
             this.history = [];
             this.error = '';
 
             this.onRefresh = function() {};
         };
 
+        FileNavigator.prototype.getBasePath = function() {
+            var path = (fileManagerConfig.basePath || '').replace(/^\//, '');
+            return path.trim() ? path.split('/') : [];
+        };
+
         FileNavigator.prototype.deferredHandler = function(data, deferred, code, defaultMsg) {
             if (!data || typeof data !== 'object') {
                 this.error = 'Error %s - Bridge response error, please check the API docs or this ajax response.'.replace('%s', code);
@@ -22,7 +27,7 @@
                 this.error = 'Error 404 - Backend bridge is not working, please check the ajax response.';
             }
             if (code == 200) {
-                this.error = '';
+                this.error = null;
             }
             if (!this.error && data.result && data.result.error) {
                 this.error = data.result.error;
@@ -46,7 +51,7 @@
         FileNavigator.prototype.refresh = function() {
             var self = this;
             if (! self.currentPath.length) {
-                self.currentPath = fileManagerConfig.basePath || [];
+                self.currentPath = this.getBasePath();
             }
             var path = self.currentPath.join('/');
             self.requesting = true;
@@ -67,7 +72,7 @@
 
             function recursive(parent, item, path) {
                 var absName = path ? (path + '/' + item.model.name) : item.model.name;
-                if (parent.name.trim() && path.trim().indexOf(parent.name) !== 0) {
+                if (parent.name && parent.name.trim() && path.trim().indexOf(parent.name) !== 0) {
                     parent.nodes = [];
                 }
                 if (parent.name !== path) {
@@ -102,7 +107,7 @@
             }
 
             //!this.history.length && this.history.push({name: '', nodes: []});
-            !this.history.length && this.history.push({ name: fileManagerConfig.basePath ? fileManagerConfig.basePath[0] : '', nodes: [] });
+            !this.history.length && this.history.push({ name: this.getBasePath()[0] || '', nodes: [] });
             flatten(this.history[0], flatNodes);
             selectedNode = findNode(flatNodes, path);
             selectedNode && (selectedNode.nodes = []);
@@ -135,7 +140,7 @@
 
         FileNavigator.prototype.fileNameExists = function(fileName) {
             return this.fileList.find(function(item) {
-                return fileName.trim && item.model.name.trim() === fileName.trim();
+                return fileName && item.model.name.trim() === fileName.trim();
             });
         };
 
@@ -145,6 +150,10 @@
             });
         };
 
+        FileNavigator.prototype.getCurrentFolderName = function() {
+            return this.currentPath.slice(-1)[0] || '/';
+        };
+
         return FileNavigator;
     }]);
 })(angular);

src/js/services/filenavigator.js

@@ -10,7 +10,13 @@
             </div>
             <div class="col-sm-3 col-md-2">
                 <div class="navbar-collapse">
-                    <div class="navbar-form navbar-right text-right">
+                    <div class="navbar-form navbar-right text-right visible-xs">
+                        <div class="pull-left" ng-if="fileNavigator.currentPath.length">
+                            <button class="btn btn-primary btn-flat" ng-click="fileNavigator.upDir()">
+                                <i class="glyphicon glyphicon-chevron-left"></i>
+                            </button>
+                            {{fileNavigator.getCurrentFolderName() | strLimit : 12}}
+                        </div>
                         <div class="btn-group">
                             <button class="btn btn-flat btn-sm dropdown-toggle" type="button" id="dropDownMenuSearch" data-toggle="dropdown" aria-expanded="true">
                                 <i class="glyphicon glyphicon-search mr2"></i>

src/templates/navbar.html

@@ -12,7 +12,7 @@
 
         <i class="glyphicon glyphicon-folder-open mr2" ng-show="isInThisPath(item.name)"></i>
         <i class="glyphicon glyphicon-folder-close mr2" ng-show="!isInThisPath(item.name)"></i>
-        {{ (item.name.split('/').pop() || '/') | strLimit : 30 }}
+        {{ (item.name.split('/').pop() || fileNavigator.getBasePath().join('/') || '/') | strLimit : 30 }}
     </a>
     <ul class="nav nav-sidebar">
         <li ng-repeat="item in item.nodes" ng-include="'folder-branch-item'" ng-class="{'active': item.name == fileNavigator.currentPath.join('/')}"></li>