From 6e4bedca2df465dbaaf775020a6de6b024624c40 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 21 Aug 2019 21:44:39 +0300 Subject: [PATCH] feature(cloudcmd) remove --progress option, make always enabled --- HELP.md | 3 --- bin/cloudcmd.js | 3 --- client/modules/operation/index.js | 2 +- json/config.json | 1 - json/help.json | 2 -- man/cloudcmd.1 | 2 -- tmpl/config.hbs | 6 ------ 7 files changed, 1 insertion(+), 18 deletions(-) diff --git a/HELP.md b/HELP.md index 44478adfd4..e88a4f07a2 100644 --- a/HELP.md +++ b/HELP.md @@ -82,7 +82,6 @@ Cloud Commander supports the following command-line parameters: | `--prefix` | set url prefix | `--prefix-socket` | set prefix for url connection | `--port` | set port number -| `--progress` | show progress of file operations | `--confirm-copy` | confirm copy | `--confirm-move` | confirm move | `--open` | open web browser when server starts @@ -117,7 +116,6 @@ Cloud Commander supports the following command-line parameters: | `--no-name` | set default tab name in web browser | `--no-keys-panel` | hide keys panel | `--no-one-file-panel` | show two file panels -| `--no-progress` | do not show progress of file operations | `--no-confirm-copy` | do not confirm copy | `--no-confirm-move` | do not confirm move | `--no-config-dialog` | disable config dialog @@ -398,7 +396,6 @@ Here's a description of all options: "root" : "/", // root directory "prefix" : "", // url prefix "prefixSocket" : "", // prefix for socket connection - "progress" : true, // show progress of file operations "confirmCopy" : true, // confirm copy "confirmMove" : true, // confirm move "showConfig" : false, // show config at startup diff --git a/bin/cloudcmd.js b/bin/cloudcmd.js index cf887908bc..a72f22414d 100755 --- a/bin/cloudcmd.js +++ b/bin/cloudcmd.js @@ -59,7 +59,6 @@ const args = require('minimist')(argv.slice(2), { 'server', 'online', 'open', - 'progress', 'config-dialog', 'config-auth', 'console', @@ -94,7 +93,6 @@ const args = require('minimist')(argv.slice(2), { 'username' : env('username') || config('username'), 'root' : choose(env('root'), config('root')), 'prefix' : config('prefix'), - 'progress' : config('progress'), 'console' : choose(env.bool('console'), config('console')), 'contact' : choose(env.bool('contact'), config('contact')), 'terminal' : choose(env.bool('terminal'), config('terminal')), @@ -159,7 +157,6 @@ function main() { config('online', args.online); config('open', args.open); config('username', args.username); - config('progress', args.progress); config('console', args.console); config('syncConsolePath', args['sync-console-path']); config('showFileName', args['show-file-name']); diff --git a/client/modules/operation/index.js b/client/modules/operation/index.js index fff15efb30..61bdec90f5 100644 --- a/client/modules/operation/index.js +++ b/client/modules/operation/index.js @@ -62,7 +62,7 @@ module.exports.init = promisify((callback) => { exec.series([ DOM.loadSocket, async (callback) => { - if (!config('progress') || config('dropbox')) + if (config('dropbox')) return callback(); const { diff --git a/json/config.json b/json/config.json index eec170c824..54e78bfe64 100644 --- a/json/config.json +++ b/json/config.json @@ -18,7 +18,6 @@ "root": "/", "prefix": "", "prefixSocket": "", - "progress": true, "contact": true, "confirmCopy": true, "confirmMove": true, diff --git a/json/help.json b/json/help.json index e9455868c1..84c6dbf96b 100644 --- a/json/help.json +++ b/json/help.json @@ -15,7 +15,6 @@ "--prefix ": "set url prefix", "--prefix-socket ": "set prefix for socket connection", "--port ": "set port number", - "--progress ": "show progress of file operations", "--confirm-copy ": "confirm copy", "--confirm-move ": "confirm move", "--open ": "open web browser when server started", @@ -51,7 +50,6 @@ "--no-one-file-panel ": "show two file panels", "--no-keys-panel ": "hide keys panel", "--no-one-file-panel ": "show two file panels", - "--no-progress ": "do not show progress of file operations", "--no-confirm-copy ": "do not confirm copy", "--no-confirm-move ": "do not confirm move", "--no-config-dialog ": "disable config dialog", diff --git a/man/cloudcmd.1 b/man/cloudcmd.1 index 9db5e7d140..781e01e1bd 100644 --- a/man/cloudcmd.1 +++ b/man/cloudcmd.1 @@ -38,7 +38,6 @@ programs in browser from any computer, mobile or tablet device. --prefix set url prefix --prefix-socket set prefix for socket connection --port set port number - --progress show progress of file operations --confirm-copy confirm copy --confirm-move confirm move --open open web browser when server started @@ -73,7 +72,6 @@ programs in browser from any computer, mobile or tablet device. --no-name set default tab name in web browser --no-one-file-panel show two file panels --no-keys-panel hide keys panel - --no-progress do not show progress of file operations --no-confirm-copy do not confirm copy --no-confirm-move do not confirm move --no-contact disable contact diff --git a/tmpl/config.hbs b/tmpl/config.hbs index 742c2b24a9..b7a3e7571f 100644 --- a/tmpl/config.hbs +++ b/tmpl/config.hbs @@ -146,12 +146,6 @@ Confirm Move - -
  • -