Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simperium update 0.3.2 #905

Merged
merged 3 commits into from Oct 16, 2018
Merged

Simperium update 0.3.2 #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e009c77
simperium update 0.3.2
acrosman Oct 11, 2018
3c7a538
Fix to logout handling
acrosman Oct 13, 2018
903a1e4
Removing unneeded code.
acrosman Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/dialogs/settings/index.jsx
View file
Open in desktop
Expand Up @@ -39,7 +39,6 @@ export class SettingsDialog extends Component {
// Safety first! Check for any unsynced notes before signing out.
const { noteBucket } = this.props;
const { notes } = this.props.appState;
const { getVersion } = noteBucket;

noteBucket.hasLocalChanges((error, hasChanges) => {
if (hasChanges) {
Expand All @@ -50,7 +49,10 @@ export class SettingsDialog extends Component {
// Also check persisted store for any notes with version 0
const noteHasSynced = note =>
new Promise((resolve, reject) =>
getVersion(note.id, (e, v) => (e || v === 0 ? reject() : resolve()))
noteBucket.getVersion(
note.id,
(e, v) => (e || v === 0 ? reject() : resolve())
)
);

Promise.all(notes.map(noteHasSynced)).then(
Expand Down
39 changes: 20 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -115,7 +115,7 @@
"redux-thunk": "2.2.0",
"sanitize-filename": "1.6.1",
"showdown": "1.8.6",
"simperium": "0.3.1",
"simperium": "0.3.2",
"valid-url": "1.0.9"
},
"optionalDependencies": {
Expand Down