diff --git a/ElectronClient/release_version.sh b/ElectronClient/release_version.sh index 0a871381ea..e0dd5911e0 100755 --- a/ElectronClient/release_version.sh +++ b/ElectronClient/release_version.sh @@ -10,5 +10,5 @@ git tag $VERSION git push && git push --tags echo "Create a draft release at: https://github.com/laurent22/joplin/releases/tag/$VERSION" - -node "$APP_DIR/update-readme-download.js" $VERSION \ No newline at end of file +echo "" +echo "Then run $APP_DIR/update-readme-download.js" \ No newline at end of file diff --git a/ReactNativeClient/lib/components/shared/note-screen-shared.js b/ReactNativeClient/lib/components/shared/note-screen-shared.js index bd9a3c23f5..ceb8a21acc 100644 --- a/ReactNativeClient/lib/components/shared/note-screen-shared.js +++ b/ReactNativeClient/lib/components/shared/note-screen-shared.js @@ -35,9 +35,14 @@ shared.saveNoteButton_press = async function(comp) { } // Save only the properties that have changed - const diff = BaseModel.diffObjects(comp.state.lastSavedNote, note); - diff.type_ = note.type_; - diff.id = note.id; + let diff = null; + if (!isNew) { + diff = BaseModel.diffObjects(comp.state.lastSavedNote, note); + diff.type_ = note.type_; + diff.id = note.id; + } else { + diff = Object.assign({}, note); + } const savedNote = await Note.save(diff); diff --git a/ReactNativeClient/lib/reducer.js b/ReactNativeClient/lib/reducer.js index 02d0b9e92b..2c7c37efbe 100644 --- a/ReactNativeClient/lib/reducer.js +++ b/ReactNativeClient/lib/reducer.js @@ -289,7 +289,7 @@ const reducer = (state = defaultState, action) => { newState.notes = newNotes; if (noteFolderHasChanged) { - newState.selectedNoteIds = newNotes.length ? [newNotes[0].id] : null; + newState.selectedNoteIds = newNotes.length ? [newNotes[0].id] : []; } break; diff --git a/ReactNativeClient/root.js b/ReactNativeClient/root.js index ace9316a5a..1193977c58 100644 --- a/ReactNativeClient/root.js +++ b/ReactNativeClient/root.js @@ -310,7 +310,7 @@ async function initialize(dispatch, backButtonHandler) { if (Setting.value('env') == 'prod') { await db.open({ name: 'joplin.sqlite' }) } else { - await db.open({ name: 'joplin-66.sqlite' }) + await db.open({ name: 'joplin-67.sqlite' }) //await db.open({ name: 'joplin-67.sqlite' }) // await db.exec('DELETE FROM notes');