self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Fixed headless sync

Browse Source
This commit is contained in:
Laurent Cozic 2017-10-25 17:41:36 +00:00
parent 900aee82f0
commit 3532b7ae87
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CliClient/app/app-gui.js
View File

@ -63,10 +63,6 @@ class AppGui {
this.currentShortcutKeys_ = []; this.currentShortcutKeys_ = [];
this.lastShortcutKeyTime_ = 0; this.lastShortcutKeyTime_ = 0;
cliUtils.setStdout((...object) => {
return this.stdout(...object);
});
// Recurrent sync is setup only when the GUI is started. In // Recurrent sync is setup only when the GUI is started. In
// a regular command it's not necessary since the process // a regular command it's not necessary since the process
// exits right away. // exits right away.

4
CliClient/app/app.js
View File

@ -592,6 +592,10 @@ class Application {
reg.setDb(this.database_); reg.setDb(this.database_);
BaseModel.db_ = this.database_; BaseModel.db_ = this.database_;
cliUtils.setStdout((object) => {
return this.stdout(object);
});
// this.store_ = createStore(reducer, applyMiddleware(this.generalMiddleware())); // this.store_ = createStore(reducer, applyMiddleware(this.generalMiddleware()));
// BaseModel.dispatch = this.store().dispatch; // BaseModel.dispatch = this.store().dispatch;
// FoldersScreenUtils.dispatch = this.store().dispatch; // FoldersScreenUtils.dispatch = this.store().dispatch;

2
CliClient/app/cli-utils.js
View File

@ -240,7 +240,7 @@ cliUtils.redraw = function(s) {
const now = time.unixMs(); const now = time.unixMs();
if (now - redrawLastUpdateTime_ > 4000) { if (now - redrawLastUpdateTime_ > 4000) {
this.stdout_ (s); this.stdout_(s);
redrawLastUpdateTime_ = now; redrawLastUpdateTime_ = now;
redrawLastLog_ = null; redrawLastLog_ = null;
} else { } else {

2
CliClient/app/onedrive-api-node-utils.js
View File

@ -43,7 +43,7 @@ class OneDriveApiNodeUtils {
this.api().setAuth(null); this.api().setAuth(null);
const port = netUtils.findAvailablePort(this.possibleOAuthDancePorts()); const port = await netUtils.findAvailablePort(this.possibleOAuthDancePorts());
if (!port) throw new Error(_('All potential ports are in use - please report the issue at %s', 'https://github.com/laurent22/joplin')); if (!port) throw new Error(_('All potential ports are in use - please report the issue at %s', 'https://github.com/laurent22/joplin'));
let authCodeUrl = this.api().authCodeUrl('http://localhost:' + port); let authCodeUrl = this.api().authCodeUrl('http://localhost:' + port);

2
CliClient/package.json
View File

@ -18,7 +18,7 @@
], ],
"owner": "Laurent Cozic" "owner": "Laurent Cozic"
}, },
"version": "0.10.50", "version": "0.10.51",
"bin": { "bin": {
"joplin": "./main.js" "joplin": "./main.js"
}, },

14
CliClient/yarn.lock
View File

@ -14,13 +14,13 @@ ajv@^4.9.1:
json-stable-stringify "^1.0.1" json-stable-stringify "^1.0.1"
ajv@^5.1.0: ajv@^5.1.0:
version "5.2.5" version "5.3.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.5.tgz#b637234d3e2675eb5f79fc652242a853a48cb49f" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.3.0.tgz#4414ff74a50879c208ee5fdc826e32c303549eda"
dependencies: dependencies:
co "^4.6.0" co "^4.6.0"
fast-deep-equal "^1.0.0" fast-deep-equal "^1.0.0"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0" json-schema-traverse "^0.3.0"
json-stable-stringify "^1.0.1"
ansi-regex@^2.0.0: ansi-regex@^2.0.0:
version "2.1.1" version "2.1.1"
@ -1083,6 +1083,10 @@ fast-deep-equal@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
fast-json-stable-stringify@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
file-entry-cache@^2.0.0: file-entry-cache@^2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
@ -2470,8 +2474,8 @@ through@^2.3.4:
resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
tkwidgets@^0.5.3: tkwidgets@^0.5.3:
version "0.5.13" version "0.5.14"
resolved "https://registry.yarnpkg.com/tkwidgets/-/tkwidgets-0.5.13.tgz#2615145554ecafcf725ecc251863d9cea48b7c7c" resolved "https://registry.yarnpkg.com/tkwidgets/-/tkwidgets-0.5.14.tgz#7fe4ec846ec3aafafdca26c06943b3da9ba17d31"
dependencies: dependencies:
chalk "^2.1.0" chalk "^2.1.0"
node-emoji "https://github.com/laurent22/node-emoji" node-emoji "https://github.com/laurent22/node-emoji"