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

CLI: Fixes #117: 'edit' command raising error in shell mode

Browse Source
This commit is contained in:
Laurent Cozic 2017-12-28 19:14:03 +00:00
parent 0926755635
commit ab959623aa
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,14 @@ class AppGui {
await this.renderer_.renderRoot(); await this.renderer_.renderRoot();
} }
termSaveState() {
return this.term().saveState();
}
termRestoreState(state) {
return this.term().restoreState(state);
}
prompt(initialText = '', promptString = ':') { prompt(initialText = '', promptString = ':') {
return this.widget('statusBar').prompt(initialText, promptString); return this.widget('statusBar').prompt(initialText, promptString);
} }

5
CliClient/app/app.js
View File

@ -283,7 +283,10 @@ class Application extends BaseApplication {
exit: () => {}, exit: () => {},
showModalOverlay: (text) => {}, showModalOverlay: (text) => {},
hideModalOverlay: () => {}, hideModalOverlay: () => {},
stdoutMaxWidth: () => { return 78; } stdoutMaxWidth: () => { return 78; },
forceRender: () => {},
termSaveState: () => {},
termRestoreState: (state) => {},
}; };
} }

4
CliClient/app/command-edit.js
View File

@ -76,12 +76,12 @@ class Command extends BaseCommand {
app().gui().showModalOverlay(_('Starting to edit note. Close the editor to get back to the prompt.')); app().gui().showModalOverlay(_('Starting to edit note. Close the editor to get back to the prompt.'));
await app().gui().forceRender(); await app().gui().forceRender();
const termState = app().gui().term().saveState(); const termState = app().gui().termSaveState();
const spawnSync = require('child_process').spawnSync; const spawnSync = require('child_process').spawnSync;
spawnSync(editorPath, editorArgs, { stdio: 'inherit' }); spawnSync(editorPath, editorArgs, { stdio: 'inherit' });
app().gui().term().restoreState(termState); app().gui().termRestoreState(termState);
app().gui().hideModalOverlay(); app().gui().hideModalOverlay();
app().gui().forceRender(); app().gui().forceRender();

5
ReactNativeClient/lib/joplin-database.js
View File

@ -205,9 +205,12 @@ class JoplinDatabase extends Database {
const existingDatabaseVersions = [0, 1, 2, 3, 4, 5, 6, 7, 8]; const existingDatabaseVersions = [0, 1, 2, 3, 4, 5, 6, 7, 8];
let currentVersionIndex = existingDatabaseVersions.indexOf(fromVersion); let currentVersionIndex = existingDatabaseVersions.indexOf(fromVersion);
if (currentVersionIndex < 0) throw new Error('Unknown profile version. Most likely this is an old version of Joplin, while the profile was created by a newer version. Please upgrade Joplin at http://joplin.cozic.net and try again.');
// currentVersionIndex < 0 if for the case where an old version of Joplin used with a newer // currentVersionIndex < 0 if for the case where an old version of Joplin used with a newer
// version of the database, so that migration is not run in this case. // version of the database, so that migration is not run in this case.
if (currentVersionIndex == existingDatabaseVersions.length - 1 || currentVersionIndex < 0) return false; if (currentVersionIndex == existingDatabaseVersions.length - 1) return false;
while (currentVersionIndex < existingDatabaseVersions.length - 1) { while (currentVersionIndex < existingDatabaseVersions.length - 1) {
const targetVersion = existingDatabaseVersions[currentVersionIndex + 1]; const targetVersion = existingDatabaseVersions[currentVersionIndex + 1];