右键菜单增加下载目录

Author: aleelock

.gitignore

@@ -13,3 +13,4 @@ _up0.sh
 *-app.asar
 .ossutil_checkpoint
 ossutil_output
+app.asar

app/components/services/auto-upgrade.js

@@ -114,7 +114,7 @@ angular.module('web')
         that._changeStatus('running');
 
         request
-          .head(from)
+          .head({url:from,timeout:10000})
           .on('error', function(err) {
             console.log(err)
             this._changeStatus('failed', err);

app/main/files/_/file-toolbar.html

@@ -42,7 +42,7 @@
       </button>
 
       <button type="button" class="btn btn-default btn-sm" ng-disabled="!sel.has" ng-click="showDownloadDialog()">
-        <i class="glyphicon glyphicon-cloud-download text-primary"></i>
+        <i class="fa fa-download text-primary"></i>
         <!-- 下载 -->
         {{'download'|translate}}
       </button>

app/main/files/files.js

@@ -96,30 +96,54 @@ angular.module('web')
 
 
       });
-      $scope.fileSpacerMenuOptions = [
-        [function(){
-          return '<i class="glyphicon glyphicon-cloud-upload text-info"></i> ' + T('upload')
-        }, function ($itemScope, $event) {
-          showUploadDialog()
-        }, function(){
-          return $scope.currentAuthInfo.privilege!='readOnly'
-        }],
-        [function(){
-          return '<i class="glyphicon glyphicon-plus text-success"></i> ' + T('folder.create')
-        }, function ($itemScope, $event) {
-          showAddFolder()
-        }, function(){
-          return $scope.currentAuthInfo.privilege!='readOnly'
-        }],
 
-        [function(){
-          return '<i class="fa fa-paste text-primary"></i> ' + T('paste') + ($scope.keepMoveOptions?'('+$scope.keepMoveOptions.items.length+')':'')
-        }, function ($itemScope, $event) {
-          showPaste()
-        }, function(){
-          return $scope.keepMoveOptions
-        }]
-      ];
+      if($scope.isMac){
+        $scope.fileSpacerMenuOptions = [
+          [function(){
+            return '<i class="fa fa-upload text-info"></i> ' + T('upload')
+          }, function ($itemScope, $event) {
+            showUploadDialog()
+          }, function(){
+            return $scope.currentAuthInfo.privilege!='readOnly'
+          }]
+        ]
+      }
+      else{
+        $scope.fileSpacerMenuOptions = [
+          [function(){
+            return '<i class="fa fa-upload text-info"></i> ' + T('file')
+          }, function ($itemScope, $event) {
+            showUploadDialog()
+          }, function(){
+            return $scope.currentAuthInfo.privilege!='readOnly'
+          }],
+
+          [function(){
+            return '<i class="fa fa-upload text-info"></i> ' + T('folder')
+          }, function ($itemScope, $event) {
+            showUploadDialog(true)
+          }, function(){
+            return $scope.currentAuthInfo.privilege!='readOnly'
+          }]
+        ]
+      }
+      $scope.fileSpacerMenuOptions = $scope.fileSpacerMenuOptions.concat([
+        [ function(){
+             return '<i class="glyphicon glyphicon-plus text-success"></i> ' + T('folder.create')
+          }, function ($itemScope, $event) {
+            showAddFolder()
+          }, function(){
+            return $scope.currentAuthInfo.privilege!='readOnly'
+          }],
+
+          [function(){
+            return '<i class="fa fa-paste text-primary"></i> ' + T('paste') + ($scope.keepMoveOptions?'('+$scope.keepMoveOptions.items.length+')':'')
+          }, function ($itemScope, $event) {
+            showPaste()
+          }, function(){
+            return $scope.keepMoveOptions
+          }]
+    ]);
 
       $scope.fileMenuOptions = function(item, $index){
         if($scope.sel.x['i_'+$index]){
@@ -137,7 +161,7 @@ angular.module('web')
         return [
           [function(){
             //download
-            return '<i class="glyphicon glyphicon-cloud-download text-primary"></i> ' + T('download')
+            return '<i class="fa fa-download text-primary"></i> ' + T('download')
           }, function ($itemScope, $event) {
             showDownloadDialog()
           }, function(){