From 19d7dd78f3bbf595308c6e76edfaa3e16ceffa4f Mon Sep 17 00:00:00 2001 From: amk Date: Thu, 10 Sep 2020 10:18:07 +0200 Subject: [PATCH] updated filemanager.js --- src/assets/dist/angular-filemanager.min.js | 29 +++++++++++++++------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/assets/dist/angular-filemanager.min.js b/src/assets/dist/angular-filemanager.min.js index d9c2f7f..1ac3d11 100755 --- a/src/assets/dist/angular-filemanager.min.js +++ b/src/assets/dist/angular-filemanager.min.js @@ -77,10 +77,20 @@ $scope.fileNavigator = new FileNavigator(); $scope.apiMiddleware = new ApiMiddleware(); $scope.uploadFileList = []; - $scope.viewTemplate = $storage.getItem('viewTemplate') || 'main-icons.html'; + $scope.viewTemplate = initTemplate(); $scope.fileList = []; $scope.temps = []; + function initTemplate() { + if (!$storage.getItem('viewTemplate')) { + return 'main-icons.html'; + } + else if ($storage.getItem('viewTemplate') === 'main-icons-preview.html' && !fileManagerConfig.enableIconPreviewView) { + return 'main-icons.html'; + } + else return $storage.getItem('viewTemplate'); + } + $scope.$watch('temps', function() { if ($scope.singleSelection()) { $scope.temp = $scope.singleSelection(); @@ -856,8 +866,6 @@ compressAsync: false, extractAsync: false, pickCallback: null, - thumbnailUrlPrefix: '', - thumbnailUrlSuffix: '', enableThumbnails: true, enableIconPreviewView: false, @@ -2436,9 +2444,13 @@ }; ApiMiddleware.prototype.getFilePath = function(item) { - return item && item.model.fullPath(); + return item && item.model.fullPath(); }; + ApiMiddleware.prototype.getThumbnailPath = function (item) { + return item && item.model.thumbnail; + }; + ApiMiddleware.prototype.list = function(path, customDeferredHandler, recycle) { return this.apiHandler.list(fileManagerConfig.listUrl, this.getPath(path), customDeferredHandler, recycle); }; @@ -2486,13 +2498,12 @@ }; ApiMiddleware.prototype.getUrl = function(item) { - var itemPath = this.getFilePath(item); + var itemPath = this.getFilePath(item); return this.apiHandler.getUrl(fileManagerConfig.downloadFileUrl, itemPath); }; ApiMiddleware.prototype.getThumbnailUrl = function(item) { - var itemPath = this.getFilePath(item); - return fileManagerConfig.thumbnailUrlPrefix + this.apiHandler.getUrl(fileManagerConfig.downloadFileUrl, itemPath) + fileManagerConfig.thumbnailUrlSuffix; + return this.getThumbnailPath(item); }; ApiMiddleware.prototype.enableThumbnails = function () { @@ -3815,12 +3826,12 @@ angular.module( 'isteven-multi-select', ['ng'] ).directive( 'istevenMultiSelect' angular.module("FileManagerApp").run(["$templateCache", function($templateCache) {$templateCache.put("src/templates/current-folder-breadcrumb.html","
    \n
  1. \n \n {{ config.appName }}\n \n
  2. \n
  3. \n \n {{dir | strLimit : 8}}\n \n \n {{dir | strLimit : 12}}\n \n
  4. \n
"); $templateCache.put("src/templates/item-context-menu.html","
\n \n\n \n
"); -$templateCache.put("src/templates/main-icons-preview.html","
\n \n\n
\n
\n
\n\n
\n {{\"no_files_in_folder\" | translate}}...\n
\n \n
\n {{ fileNavigator.error }}\n
\n
"); +$templateCache.put("src/templates/main-icons-preview.html","
\n \n\n
\n
\n
\n\n
\n {{\"no_files_in_folder\" | translate}}...\n
\n \n
\n {{ fileNavigator.error }}\n
\n
"); $templateCache.put("src/templates/main-icons.html","
\n \n\n
\n
\n
\n\n
\n {{\"no_files_in_folder\" | translate}}...\n
\n \n
\n {{ fileNavigator.error }}\n
\n
"); $templateCache.put("src/templates/main-table-modal.html","\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n
\n \n {{\"name\" | translate}}\n \n \n
\n
\n
\n {{\"no_folders_in_folder\" | translate}}...\n \n \n
\n {{ fileNavigator.error }}\n
\n \n \n {{item.model.name | strLimit : 32}}\n \n \n \n
"); $templateCache.put("src/templates/main-table.html","\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n
\n \n {{\"name\" | translate}}\n \n \n \n \n {{\"size\" | translate}}\n \n \n \n \n {{\"date\" | translate}}\n \n \n \n \n {{\"permissions\" | translate}}\n \n \n
\n
\n
\n {{\"no_files_in_folder\" | translate}}...\n
\n {{ fileNavigator.error }}\n
\n \n \n \n {{item.model.name | strLimit : 64}}\n \n \n \n {{item.model.size | humanReadableFileSize}}\n \n \n {{item.model.date | formatDate }}\n \n {{item.model.perms.toCode(item.model.type === \'dir\'?\'d\':\'-\')}}\n
\n"); $templateCache.put("src/templates/main.html","
\n
\n\n
\n
\n\n
\n
\n\n
\n
\n
\n
\n
\n\n
\n
\n
\n"); $templateCache.put("src/templates/modals.html","
\n
\n
\n
\n \n

{{\"preview\" | translate}}

\n
\n
\n
\n\n \"{{singleSelection().model.name}}\"\n {{\'loading\' | translate}} ...\n
\n
\n
\n
\n \n
\n
\n
\n
\n\n
\n
\n
\n
\n
\n \n

{{\"confirm\" | translate}}

\n
\n
\n {{\'sure_to_delete\' | translate}} \n\n
\n
\n
\n \n \n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n
\n \n

{{\'move\' | translate}}

\n
\n
\n
\n
\n
\n
\n \n \n
\n
\n
\n
\n
\n\n\n
\n
\n
\n
\n
\n \n

{{\'rename\' | translate}}

\n
\n
\n \n \n\n
\n
\n
\n \n \n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n
\n \n

{{\'copy_file\' | translate}}

\n
\n
\n
\n \n \n
\n\n
\n
\n
\n
\n \n \n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n
\n \n

{{\'compress\' | translate}}

\n
\n
\n
\n
{{\'compression_started\' | translate}}
\n
\n
\n
\n {{\'sure_to_start_compression_with\' | translate}} {{singleSelection().model.name}} ?\n
\n
\n \n \n
\n
\n\n
\n
\n
\n
\n \n
\n
\n \n \n
\n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n
\n \n

{{\'extract_item\' | translate}}

\n
\n
\n
\n
{{\'extraction_started\' | translate}}
\n
\n
\n \n \n
\n
\n
\n
\n
\n \n
\n
\n \n \n
\n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n
\n \n \n

{{\'edit_file\' | translate}}

\n
\n
\n \n {{\'loading\' | translate}} ...\n \n
\n
\n
\n \n \n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n
\n \n

{{\'new_folder\' | translate}}

\n
\n
\n \n \n
\n
\n
\n \n \n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n
\n \n

{{\"upload_files\" | translate}}

\n
\n
\n \n \n\n
\n
    \n
  • \n \n
    {{uploadFile.name}}
    \n

    {{uploadFile.size | humanReadableFileSize}}

    \n
  • \n
\n
\n {{\"uploading\" | translate}}... {{apiMiddleware.apiHandler.progress}}%\n
\n
\n
\n
\n
\n
\n
\n
\n
\n \n \n
\n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n \n
\n \n

{{\'change_permissions\' | translate}}

\n
\n
\n
\n
\n

{{\'read\' | translate}}

\n \n
\n
\n
\n
\n
\n
\n

{{\'write\' | translate}}

\n\n \n
\n
\n
\n
\n
\n
\n

{{\'delete\' | translate}}

\n \n
\n
\n
\n
\n
\n
\n
\n \n \n
\n \n \n \n\n\n
\n
\n
\n
\n
\n \n

{{\'copy_links\' | translate}}

\n
\n
\n\n \n\n
\n \n \n \n \n
\n\n \n\n
\n \n \n \n \n
\n\n \n\n
\n \n \n \n \n
\n\n
\n
\n \n
\n
\n
\n
\n
\n\n
\n
\n
\n
\n \n

{{\"select_destination_folder\" | translate}}

\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n \n
\n
\n
\n
\n\n\n\n\n\n\n"); -$templateCache.put("src/templates/navbar.html",""); +$templateCache.put("src/templates/navbar.html",""); $templateCache.put("src/templates/sidebar.html","\n\n"); $templateCache.put("src/templates/spinner.html","
\n \n \n \n
");}]); \ No newline at end of file