eslint --fix: added missing semicolons
This commit is contained in:
@@ -15,8 +15,8 @@ export class PureCtrl {
|
|||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.state = Object.freeze(Object.assign({}, this.state, state));
|
this.state = Object.freeze(Object.assign({}, this.state, state));
|
||||||
resolve();
|
resolve();
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
initProps(props) {
|
initProps(props) {
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
editorDebounce: EDITOR_DEBOUNCE,
|
editorDebounce: EDITOR_DEBOUNCE,
|
||||||
isDesktop: isDesktopApplication(),
|
isDesktop: isDesktopApplication(),
|
||||||
spellcheck: true
|
spellcheck: true
|
||||||
}
|
};
|
||||||
|
|
||||||
this.leftResizeControl = {};
|
this.leftResizeControl = {};
|
||||||
this.rightResizeControl = {};
|
this.rightResizeControl = {};
|
||||||
@@ -223,7 +223,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
const editor = this.editorForNote(this.state.note);
|
const editor = this.editorForNote(this.state.note);
|
||||||
this.setState({
|
this.setState({
|
||||||
selectedEditor: editor
|
selectedEditor: editor
|
||||||
})
|
});
|
||||||
if (!editor) {
|
if (!editor) {
|
||||||
this.reloadFont();
|
this.reloadFont();
|
||||||
}
|
}
|
||||||
@@ -247,7 +247,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
/** if we're still dirty, don't change status, a sync is likely upcoming. */
|
/** if we're still dirty, don't change status, a sync is likely upcoming. */
|
||||||
} else {
|
} else {
|
||||||
const savedItem = data.savedItems.find((item) => {
|
const savedItem = data.savedItems.find((item) => {
|
||||||
return item.uuid === this.state.note.uuid
|
return item.uuid === this.state.note.uuid;
|
||||||
});
|
});
|
||||||
const isInErrorState = this.state.saveError;
|
const isInErrorState = this.state.saveError;
|
||||||
if (isInErrorState || savedItem) {
|
if (isInErrorState || savedItem) {
|
||||||
@@ -276,9 +276,9 @@ class EditorCtrl extends PureCtrl {
|
|||||||
message: "Offline Saving Issue",
|
message: "Offline Saving Issue",
|
||||||
desc: "Changes not saved"
|
desc: "Changes not saved"
|
||||||
});
|
});
|
||||||
}, 500)
|
}, 500);
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
editorForNote(note) {
|
editorForNote(note) {
|
||||||
@@ -574,8 +574,8 @@ class EditorCtrl extends PureCtrl {
|
|||||||
this.appState.setSelectedNote(null);
|
this.appState.setSelectedNote(null);
|
||||||
this.setMenuState('showOptionsMenu', false);
|
this.setMenuState('showOptionsMenu', false);
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
};
|
||||||
const requiresPrivilege = await this.privilegesManager.actionRequiresPrivilege(
|
const requiresPrivilege = await this.privilegesManager.actionRequiresPrivilege(
|
||||||
PrivilegesManager.ActionDeleteNote
|
PrivilegesManager.ActionDeleteNote
|
||||||
);
|
);
|
||||||
@@ -631,7 +631,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
this.modelManager.emptyTrash();
|
this.modelManager.emptyTrash();
|
||||||
this.syncManager.sync();
|
this.syncManager.sync();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
togglePin() {
|
togglePin() {
|
||||||
@@ -755,7 +755,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
return string.length > 0;
|
return string.length > 0;
|
||||||
}).map((string) => {
|
}).map((string) => {
|
||||||
return string.trim();
|
return string.trim();
|
||||||
})
|
});
|
||||||
this.state.note.dummy = false;
|
this.state.note.dummy = false;
|
||||||
this.updateTags(strings);
|
this.updateTags(strings);
|
||||||
}
|
}
|
||||||
@@ -862,16 +862,16 @@ class EditorCtrl extends PureCtrl {
|
|||||||
/** Allows textarea to reload */
|
/** Allows textarea to reload */
|
||||||
await this.setState({
|
await this.setState({
|
||||||
noteReady: false
|
noteReady: false
|
||||||
})
|
});
|
||||||
this.setState({
|
this.setState({
|
||||||
noteReady: true
|
noteReady: true
|
||||||
})
|
});
|
||||||
this.reloadFont();
|
this.reloadFont();
|
||||||
} else if (key === PREF_EDITOR_RESIZERS_ENABLED && this[key] === true) {
|
} else if (key === PREF_EDITOR_RESIZERS_ENABLED && this[key] === true) {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.leftResizeControl.flash();
|
this.leftResizeControl.flash();
|
||||||
this.rightResizeControl.flash();
|
this.rightResizeControl.flash();
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -961,7 +961,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
'style',
|
'style',
|
||||||
`width: ${widthString}; height: ${heightString};`
|
`width: ${widthString}; height: ${heightString};`
|
||||||
);
|
);
|
||||||
}
|
};
|
||||||
if (data.type === 'container') {
|
if (data.type === 'container') {
|
||||||
if (component.area === 'note-tags') {
|
if (component.area === 'note-tags') {
|
||||||
const container = document.getElementById(
|
const container = document.getElementById(
|
||||||
@@ -983,7 +983,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
}
|
}
|
||||||
else if (action === 'save-items') {
|
else if (action === 'save-items') {
|
||||||
const includesNote = data.items.map((item) => {
|
const includesNote = data.items.map((item) => {
|
||||||
return item.uuid
|
return item.uuid;
|
||||||
}).includes(this.state.note.uuid);
|
}).includes(this.state.note.uuid);
|
||||||
if (includesNote) {
|
if (includesNote) {
|
||||||
this.showSavingStatus();
|
this.showSavingStatus();
|
||||||
@@ -1001,7 +1001,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
state: components
|
state: components
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
reloadComponentContext() {
|
reloadComponentContext() {
|
||||||
@@ -1071,14 +1071,14 @@ class EditorCtrl extends PureCtrl {
|
|||||||
onKeyDown: () => {
|
onKeyDown: () => {
|
||||||
this.setState({
|
this.setState({
|
||||||
altKeyDown: true
|
altKeyDown: true
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
onKeyUp: () => {
|
onKeyUp: () => {
|
||||||
this.setState({
|
this.setState({
|
||||||
altKeyDown: false
|
altKeyDown: false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
this.trashKeyObserver = this.keyboardManager.addKeyObserver({
|
this.trashKeyObserver = this.keyboardManager.addKeyObserver({
|
||||||
key: KeyboardManager.KeyBackspace,
|
key: KeyboardManager.KeyBackspace,
|
||||||
@@ -1090,7 +1090,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
onKeyDown: () => {
|
onKeyDown: () => {
|
||||||
this.deleteNote();
|
this.deleteNote();
|
||||||
},
|
},
|
||||||
})
|
});
|
||||||
|
|
||||||
this.deleteKeyObserver = this.keyboardManager.addKeyObserver({
|
this.deleteKeyObserver = this.keyboardManager.addKeyObserver({
|
||||||
key: KeyboardManager.KeyBackspace,
|
key: KeyboardManager.KeyBackspace,
|
||||||
@@ -1103,7 +1103,7 @@ class EditorCtrl extends PureCtrl {
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
this.deleteNote(true);
|
this.deleteNote(true);
|
||||||
},
|
},
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
onSystemEditorLoad() {
|
onSystemEditorLoad() {
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ class FooterCtrl {
|
|||||||
this.findErrors();
|
this.findErrors();
|
||||||
this.updateOfflineStatus();
|
this.updateOfflineStatus();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,7 +137,7 @@ class FooterCtrl {
|
|||||||
'SN|Component',
|
'SN|Component',
|
||||||
(allItems, validItems, deletedItems, source) => {
|
(allItems, validItems, deletedItems, source) => {
|
||||||
this.rooms = this.modelManager.components.filter((candidate) => {
|
this.rooms = this.modelManager.components.filter((candidate) => {
|
||||||
return candidate.area === 'rooms' && !candidate.deleted
|
return candidate.area === 'rooms' && !candidate.deleted;
|
||||||
});
|
});
|
||||||
if(this.queueExtReload) {
|
if(this.queueExtReload) {
|
||||||
this.queueExtReload = false;
|
this.queueExtReload = false;
|
||||||
@@ -259,7 +259,7 @@ class FooterCtrl {
|
|||||||
}).then((response) => {
|
}).then((response) => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.isRefreshing = false;
|
this.isRefreshing = false;
|
||||||
}, 200)
|
}, 200);
|
||||||
if(response && response.error) {
|
if(response && response.error) {
|
||||||
this.alertManager.alert({
|
this.alertManager.alert({
|
||||||
text: STRING_GENERIC_SYNC_ERROR
|
text: STRING_GENERIC_SYNC_ERROR
|
||||||
@@ -282,7 +282,7 @@ class FooterCtrl {
|
|||||||
this.newUpdateAvailable = false;
|
this.newUpdateAvailable = false;
|
||||||
this.alertManager.alert({
|
this.alertManager.alert({
|
||||||
text: STRING_NEW_UPDATE_READY
|
text: STRING_NEW_UPDATE_READY
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
reloadDockShortcuts() {
|
reloadDockShortcuts() {
|
||||||
@@ -297,7 +297,7 @@ class FooterCtrl {
|
|||||||
name: name,
|
name: name,
|
||||||
component: theme,
|
component: theme,
|
||||||
icon: icon
|
icon: icon
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
this.dockShortcuts = shortcuts.sort((a, b) => {
|
this.dockShortcuts = shortcuts.sort((a, b) => {
|
||||||
@@ -341,8 +341,8 @@ class FooterCtrl {
|
|||||||
const run = () => {
|
const run = () => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
room.showRoom = !room.showRoom;
|
room.showRoom = !room.showRoom;
|
||||||
})
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
if(!room.showRoom) {
|
if(!room.showRoom) {
|
||||||
const requiresPrivilege = await this.privilegesManager.actionRequiresPrivilege(
|
const requiresPrivilege = await this.privilegesManager.actionRequiresPrivilege(
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ class LockScreenCtrl {
|
|||||||
input.focus();
|
input.focus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
submitPasscodeForm($event) {
|
submitPasscodeForm($event) {
|
||||||
@@ -83,9 +83,9 @@ class LockScreenCtrl {
|
|||||||
onConfirm: () => {
|
onConfirm: () => {
|
||||||
this.authManager.signout(true).then(() => {
|
this.authManager.signout(true).then(() => {
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export function filterAndSortNotes({
|
|||||||
notes: filtered,
|
notes: filtered,
|
||||||
sortBy,
|
sortBy,
|
||||||
reverse
|
reverse
|
||||||
})
|
});
|
||||||
return sorted;
|
return sorted;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,10 +143,10 @@ export function sortNotes({
|
|||||||
if (aValue > bValue) { return -1 * vector; }
|
if (aValue > bValue) { return -1 * vector; }
|
||||||
else if (aValue < bValue) { return 1 * vector; }
|
else if (aValue < bValue) { return 1 * vector; }
|
||||||
return 0;
|
return 0;
|
||||||
}
|
};
|
||||||
|
|
||||||
const result = notes.sort(function (a, b) {
|
const result = notes.sort(function (a, b) {
|
||||||
return sortValueFn(a, b);
|
return sortValueFn(a, b);
|
||||||
})
|
});
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ class NotesCtrl extends PureCtrl {
|
|||||||
panelTitle: null,
|
panelTitle: null,
|
||||||
mutable: { showMenu: false },
|
mutable: { showMenu: false },
|
||||||
noteFilter: { text: '' },
|
noteFilter: { text: '' },
|
||||||
}
|
};
|
||||||
|
|
||||||
this.panelController = {};
|
this.panelController = {};
|
||||||
window.onresize = (event) => {
|
window.onresize = (event) => {
|
||||||
@@ -124,7 +124,7 @@ class NotesCtrl extends PureCtrl {
|
|||||||
this.modelManager.removeItemLocally(this.state.selectedNote);
|
this.modelManager.removeItemLocally(this.state.selectedNote);
|
||||||
this.selectNote(null).then(() => {
|
this.selectNote(null).then(() => {
|
||||||
this.reloadNotes();
|
this.reloadNotes();
|
||||||
})
|
});
|
||||||
/**
|
/**
|
||||||
* We want to see if the user will download any items from the server.
|
* We want to see if the user will download any items from the server.
|
||||||
* If the next sync completes and our notes are still 0,
|
* If the next sync completes and our notes are still 0,
|
||||||
@@ -133,7 +133,7 @@ class NotesCtrl extends PureCtrl {
|
|||||||
this.createDummyOnSynCompletionIfNoNotes = true;
|
this.createDummyOnSynCompletionIfNoNotes = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
addSyncEventHandler() {
|
addSyncEventHandler() {
|
||||||
@@ -270,7 +270,7 @@ class NotesCtrl extends PureCtrl {
|
|||||||
...this.state.mutable,
|
...this.state.mutable,
|
||||||
showMenu: false
|
showMenu: false
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleNoteSelection(note) {
|
async handleNoteSelection(note) {
|
||||||
@@ -284,7 +284,7 @@ class NotesCtrl extends PureCtrl {
|
|||||||
}
|
}
|
||||||
await this.setState({
|
await this.setState({
|
||||||
selectedNote: note
|
selectedNote: note
|
||||||
})
|
});
|
||||||
if (!note) {
|
if (!note) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -351,7 +351,7 @@ class NotesCtrl extends PureCtrl {
|
|||||||
this.appState.panelDidResize({
|
this.appState.panelDidResize({
|
||||||
name: PANEL_NAME_NOTES,
|
name: PANEL_NAME_NOTES,
|
||||||
collapsed: this.panelController.isCollapsed()
|
collapsed: this.panelController.isCollapsed()
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -391,14 +391,14 @@ class NotesCtrl extends PureCtrl {
|
|||||||
reloadPanelTitle() {
|
reloadPanelTitle() {
|
||||||
let title;
|
let title;
|
||||||
if (this.isFiltering()) {
|
if (this.isFiltering()) {
|
||||||
const resultCount = this.state.notes.length
|
const resultCount = this.state.notes.length;
|
||||||
title = `${resultCount} search results`;
|
title = `${resultCount} search results`;
|
||||||
} else if (this.state.tag) {
|
} else if (this.state.tag) {
|
||||||
title = `${this.state.tag.title}`;
|
title = `${this.state.tag.title}`;
|
||||||
}
|
}
|
||||||
this.setState({
|
this.setState({
|
||||||
panelTitle: title
|
panelTitle: title
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
optionsSubtitle() {
|
optionsSubtitle() {
|
||||||
@@ -411,13 +411,13 @@ class NotesCtrl extends PureCtrl {
|
|||||||
base += " Title";
|
base += " Title";
|
||||||
}
|
}
|
||||||
if (this.state.showArchived) {
|
if (this.state.showArchived) {
|
||||||
base += " | + Archived"
|
base += " | + Archived";
|
||||||
}
|
}
|
||||||
if (this.state.hidePinned) {
|
if (this.state.hidePinned) {
|
||||||
base += " | – Pinned"
|
base += " | – Pinned";
|
||||||
}
|
}
|
||||||
if (this.state.sortReverse) {
|
if (this.state.sortReverse) {
|
||||||
base += " | Reversed"
|
base += " | Reversed";
|
||||||
}
|
}
|
||||||
return base;
|
return base;
|
||||||
}
|
}
|
||||||
@@ -428,49 +428,49 @@ class NotesCtrl extends PureCtrl {
|
|||||||
flags.push({
|
flags.push({
|
||||||
text: "Pinned",
|
text: "Pinned",
|
||||||
class: 'info'
|
class: 'info'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (note.archived) {
|
if (note.archived) {
|
||||||
flags.push({
|
flags.push({
|
||||||
text: "Archived",
|
text: "Archived",
|
||||||
class: 'warning'
|
class: 'warning'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (note.content.protected) {
|
if (note.content.protected) {
|
||||||
flags.push({
|
flags.push({
|
||||||
text: "Protected",
|
text: "Protected",
|
||||||
class: 'success'
|
class: 'success'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (note.locked) {
|
if (note.locked) {
|
||||||
flags.push({
|
flags.push({
|
||||||
text: "Locked",
|
text: "Locked",
|
||||||
class: 'neutral'
|
class: 'neutral'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (note.content.trashed) {
|
if (note.content.trashed) {
|
||||||
flags.push({
|
flags.push({
|
||||||
text: "Deleted",
|
text: "Deleted",
|
||||||
class: 'danger'
|
class: 'danger'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (note.content.conflict_of) {
|
if (note.content.conflict_of) {
|
||||||
flags.push({
|
flags.push({
|
||||||
text: "Conflicted Copy",
|
text: "Conflicted Copy",
|
||||||
class: 'danger'
|
class: 'danger'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (note.errorDecrypting) {
|
if (note.errorDecrypting) {
|
||||||
flags.push({
|
flags.push({
|
||||||
text: "Missing Keys",
|
text: "Missing Keys",
|
||||||
class: 'danger'
|
class: 'danger'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
if (note.deleted) {
|
if (note.deleted) {
|
||||||
flags.push({
|
flags.push({
|
||||||
text: "Deletion Pending Sync",
|
text: "Deletion Pending Sync",
|
||||||
class: 'danger'
|
class: 'danger'
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
note.flags = flags;
|
note.flags = flags;
|
||||||
return flags;
|
return flags;
|
||||||
@@ -566,7 +566,7 @@ class NotesCtrl extends PureCtrl {
|
|||||||
...this.state.noteFilter,
|
...this.state.noteFilter,
|
||||||
text: text
|
text: text
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async clearFilterText() {
|
async clearFilterText() {
|
||||||
@@ -671,7 +671,7 @@ class NotesCtrl extends PureCtrl {
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
this.createNewNote();
|
this.createNewNote();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
this.nextNoteKeyObserver = this.keyboardManager.addKeyObserver({
|
this.nextNoteKeyObserver = this.keyboardManager.addKeyObserver({
|
||||||
key: KeyboardManager.KeyDown,
|
key: KeyboardManager.KeyDown,
|
||||||
@@ -682,11 +682,11 @@ class NotesCtrl extends PureCtrl {
|
|||||||
onKeyDown: (event) => {
|
onKeyDown: (event) => {
|
||||||
const searchBar = this.getSearchBar();
|
const searchBar = this.getSearchBar();
|
||||||
if (searchBar === document.activeElement) {
|
if (searchBar === document.activeElement) {
|
||||||
searchBar.blur()
|
searchBar.blur();
|
||||||
}
|
}
|
||||||
this.selectNextNote();
|
this.selectNextNote();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
this.nextNoteKeyObserver = this.keyboardManager.addKeyObserver({
|
this.nextNoteKeyObserver = this.keyboardManager.addKeyObserver({
|
||||||
key: KeyboardManager.KeyUp,
|
key: KeyboardManager.KeyUp,
|
||||||
@@ -704,9 +704,9 @@ class NotesCtrl extends PureCtrl {
|
|||||||
],
|
],
|
||||||
onKeyDown: (event) => {
|
onKeyDown: (event) => {
|
||||||
const searchBar = this.getSearchBar();
|
const searchBar = this.getSearchBar();
|
||||||
if (searchBar) { searchBar.focus() };
|
if (searchBar) { searchBar.focus(); };
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ class RootCtrl {
|
|||||||
if(this.tagsCollapsed) { appClass += " collapsed-tags"; }
|
if(this.tagsCollapsed) { appClass += " collapsed-tags"; }
|
||||||
this.$scope.appClass = appClass;
|
this.$scope.appClass = appClass;
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
loadAfterUnlock() {
|
loadAfterUnlock() {
|
||||||
@@ -143,13 +143,13 @@ class RootCtrl {
|
|||||||
this.syncManager.clearSyncToken();
|
this.syncManager.clearSyncToken();
|
||||||
this.syncManager.sync();
|
this.syncManager.sync();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
addSyncStatusObserver() {
|
addSyncStatusObserver() {
|
||||||
this.syncStatusObserver = this.syncManager.registerSyncStatusObserver((status) => {
|
this.syncStatusObserver = this.syncManager.registerSyncStatusObserver((status) => {
|
||||||
if(status.retrievedCount > 20) {
|
if(status.retrievedCount > 20) {
|
||||||
const text = `Downloading ${status.retrievedCount} items. Keep app open.`
|
const text = `Downloading ${status.retrievedCount} items. Keep app open.`;
|
||||||
this.syncStatus = this.statusManager.replaceStatusWithString(
|
this.syncStatus = this.statusManager.replaceStatusWithString(
|
||||||
this.syncStatus,
|
this.syncStatus,
|
||||||
text
|
text
|
||||||
@@ -230,7 +230,7 @@ class RootCtrl {
|
|||||||
encryptionEnabled ? "Decrypting items..." : "Loading items..."
|
encryptionEnabled ? "Decrypting items..." : "Loading items..."
|
||||||
);
|
);
|
||||||
const incrementalCallback = (current, total) => {
|
const incrementalCallback = (current, total) => {
|
||||||
const notesString = `${current}/${total} items...`
|
const notesString = `${current}/${total} items...`;
|
||||||
const status = encryptionEnabled
|
const status = encryptionEnabled
|
||||||
? `Decrypting ${notesString}`
|
? `Decrypting ${notesString}`
|
||||||
: `Loading ${notesString}`;
|
: `Loading ${notesString}`;
|
||||||
@@ -238,7 +238,7 @@ class RootCtrl {
|
|||||||
this.syncStatus,
|
this.syncStatus,
|
||||||
status
|
status
|
||||||
);
|
);
|
||||||
}
|
};
|
||||||
this.syncManager.loadLocalItems({incrementalCallback}).then(() => {
|
this.syncManager.loadLocalItems({incrementalCallback}).then(() => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.$rootScope.$broadcast("initial-data-loaded");
|
this.$rootScope.$broadcast("initial-data-loaded");
|
||||||
@@ -250,7 +250,7 @@ class RootCtrl {
|
|||||||
performIntegrityCheck: true
|
performIntegrityCheck: true
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.syncStatus = this.statusManager.removeStatus(this.syncStatus);
|
this.syncStatus = this.statusManager.removeStatus(this.syncStatus);
|
||||||
})
|
});
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
this.syncManager.sync();
|
this.syncManager.sync();
|
||||||
}, AUTO_SYNC_INTERVAL);
|
}, AUTO_SYNC_INTERVAL);
|
||||||
@@ -321,9 +321,9 @@ class RootCtrl {
|
|||||||
{}
|
{}
|
||||||
).then((response) => {
|
).then((response) => {
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
if(urlParam('server')) {
|
if(urlParam('server')) {
|
||||||
autoSignInFromParams();
|
autoSignInFromParams();
|
||||||
|
|||||||
@@ -294,7 +294,7 @@ class AccountMenuCtrl extends PureCtrl {
|
|||||||
*/
|
*/
|
||||||
async clearDatabaseAndRewriteAllItems({ alternateUuids } = {}) {
|
async clearDatabaseAndRewriteAllItems({ alternateUuids } = {}) {
|
||||||
await this.storageManager.clearAllModels();
|
await this.storageManager.clearAllModels();
|
||||||
await this.syncManager.markAllItemsDirtyAndSaveOffline(alternateUuids)
|
await this.syncManager.markAllItemsDirtyAndSaveOffline(alternateUuids);
|
||||||
}
|
}
|
||||||
|
|
||||||
destroyLocalData() {
|
destroyLocalData() {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class ActionsMenuCtrl extends PureCtrl {
|
|||||||
$onInit() {
|
$onInit() {
|
||||||
this.initProps({
|
this.initProps({
|
||||||
item: this.item
|
item: this.item
|
||||||
})
|
});
|
||||||
this.loadExtensions();
|
this.loadExtensions();
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -57,7 +57,7 @@ class ActionsMenuCtrl extends PureCtrl {
|
|||||||
await this.actionsManager.loadExtensionInContextOfItem(extension, this.props.item);
|
await this.actionsManager.loadExtensionInContextOfItem(extension, this.props.item);
|
||||||
this.setState({
|
this.setState({
|
||||||
extensions: this.state.extensions
|
extensions: this.state.extensions
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleActionResult(action, result) {
|
handleActionResult(action, result) {
|
||||||
@@ -84,8 +84,8 @@ class ActionsMenuCtrl extends PureCtrl {
|
|||||||
label: subaction.label,
|
label: subaction.label,
|
||||||
subtitle: subaction.desc,
|
subtitle: subaction.desc,
|
||||||
spinnerClass: subaction.running ? 'info' : null
|
spinnerClass: subaction.running ? 'info' : null
|
||||||
}
|
};
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export class ComponentModalCtrl {
|
|||||||
this.$element.remove();
|
this.$element.remove();
|
||||||
this.$scope.$destroy();
|
this.$scope.$destroy();
|
||||||
if(this.onDismiss && this.onDismiss()) {
|
if(this.onDismiss && this.onDismiss()) {
|
||||||
this.onDismiss()(this.component)
|
this.onDismiss()(this.component);
|
||||||
}
|
}
|
||||||
callback && callback();
|
callback && callback();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ class ComponentViewCtrl {
|
|||||||
});
|
});
|
||||||
$scope.$on('ext-reload-complete', () => {
|
$scope.$on('ext-reload-complete', () => {
|
||||||
this.reloadStatus(false);
|
this.reloadStatus(false);
|
||||||
})
|
});
|
||||||
$scope.$on('$destroy', () => {
|
$scope.$on('$destroy', () => {
|
||||||
this.destroy();
|
this.destroy();
|
||||||
});
|
});
|
||||||
@@ -47,7 +47,7 @@ class ComponentViewCtrl {
|
|||||||
if(component === this.component && component.active) {
|
if(component === this.component && component.active) {
|
||||||
this.reloadComponent();
|
this.reloadComponent();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
registerComponentHandlers() {
|
registerComponentHandlers() {
|
||||||
@@ -70,7 +70,7 @@ class ComponentViewCtrl {
|
|||||||
}
|
}
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.handleActivation();
|
this.handleActivation();
|
||||||
})
|
});
|
||||||
},
|
},
|
||||||
actionHandler: (component, action, data) => {
|
actionHandler: (component, action, data) => {
|
||||||
if(action === 'set-size') {
|
if(action === 'set-size') {
|
||||||
@@ -116,9 +116,9 @@ class ComponentViewCtrl {
|
|||||||
this.loading = false;
|
this.loading = false;
|
||||||
}
|
}
|
||||||
if(offlineRestricted) {
|
if(offlineRestricted) {
|
||||||
this.error = 'offline-restricted'
|
this.error = 'offline-restricted';
|
||||||
} else if(hasUrlError) {
|
} else if(hasUrlError) {
|
||||||
this.error = 'url-missing'
|
this.error = 'url-missing';
|
||||||
} else {
|
} else {
|
||||||
this.error = null;
|
this.error = null;
|
||||||
}
|
}
|
||||||
@@ -133,7 +133,7 @@ class ComponentViewCtrl {
|
|||||||
this.reloadThemeStatus();
|
this.reloadThemeStatus();
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.reloading = false;
|
this.reloading = false;
|
||||||
}, 500)
|
}, 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
handleActivation() {
|
handleActivation() {
|
||||||
@@ -195,7 +195,7 @@ class ComponentViewCtrl {
|
|||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.issueLoading = desktopError ? true : false;
|
this.issueLoading = desktopError ? true : false;
|
||||||
this.onLoad && this.onLoad(this.component);
|
this.onLoad && this.onLoad(this.component);
|
||||||
}, avoidFlickerTimeout)
|
}, avoidFlickerTimeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
componentValueDidSet(component, prevComponent) {
|
componentValueDidSet(component, prevComponent) {
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class ConflictResolutionCtrl {
|
|||||||
this.modelManager.setItemToBeDeleted(this.item2);
|
this.modelManager.setItemToBeDeleted(this.item2);
|
||||||
this.syncManager.sync().then(() => {
|
this.syncManager.sync().then(() => {
|
||||||
this.applyCallback();
|
this.applyCallback();
|
||||||
})
|
});
|
||||||
this.dismiss();
|
this.dismiss();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -52,7 +52,7 @@ class ConflictResolutionCtrl {
|
|||||||
this.modelManager.setItemToBeDeleted(this.item1);
|
this.modelManager.setItemToBeDeleted(this.item1);
|
||||||
this.syncManager.sync().then(() => {
|
this.syncManager.sync().then(() => {
|
||||||
this.applyCallback();
|
this.applyCallback();
|
||||||
})
|
});
|
||||||
this.dismiss();
|
this.dismiss();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class EditorMenuCtrl extends PureCtrl {
|
|||||||
this.syncManager = syncManager;
|
this.syncManager = syncManager;
|
||||||
this.state = {
|
this.state = {
|
||||||
isDesktop: isDesktopApplication()
|
isDesktop: isDesktopApplication()
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
$onInit() {
|
$onInit() {
|
||||||
@@ -29,7 +29,7 @@ class EditorMenuCtrl extends PureCtrl {
|
|||||||
this.setState({
|
this.setState({
|
||||||
editors: editors,
|
editors: editors,
|
||||||
defaultEditor: defaultEditor
|
defaultEditor: defaultEditor
|
||||||
})
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
selectComponent(component) {
|
selectComponent(component) {
|
||||||
@@ -42,7 +42,7 @@ class EditorMenuCtrl extends PureCtrl {
|
|||||||
}
|
}
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.callback()(component);
|
this.callback()(component);
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleDefaultForEditor(editor) {
|
toggleDefaultForEditor(editor) {
|
||||||
@@ -70,7 +70,7 @@ class EditorMenuCtrl extends PureCtrl {
|
|||||||
this.syncManager.sync();
|
this.syncManager.sync();
|
||||||
this.setState({
|
this.setState({
|
||||||
defaultEditor: component
|
defaultEditor: component
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
removeEditorDefault(component) {
|
removeEditorDefault(component) {
|
||||||
@@ -79,7 +79,7 @@ class EditorMenuCtrl extends PureCtrl {
|
|||||||
this.syncManager.sync();
|
this.syncManager.sync();
|
||||||
this.setState({
|
this.setState({
|
||||||
defaultEditor: null
|
defaultEditor: null
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
shouldDisplayRunningLocallyLabel(component) {
|
shouldDisplayRunningLocallyLabel(component) {
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ const Steps = {
|
|||||||
PasswordStep: 3,
|
PasswordStep: 3,
|
||||||
SyncStep: 4,
|
SyncStep: 4,
|
||||||
FinishStep: 5
|
FinishStep: 5
|
||||||
}
|
};
|
||||||
|
|
||||||
class PasswordWizardCtrl {
|
class PasswordWizardCtrl {
|
||||||
/* @ngInject */
|
/* @ngInject */
|
||||||
@@ -95,12 +95,12 @@ class PasswordWizardCtrl {
|
|||||||
this.step++;
|
this.step++;
|
||||||
this.initializeStep(this.step);
|
this.initializeStep(this.step);
|
||||||
this.isContinuing = false;
|
this.isContinuing = false;
|
||||||
}
|
};
|
||||||
const preprocessor = this.preprocessorForStep(this.step);
|
const preprocessor = this.preprocessorForStep(this.step);
|
||||||
if (preprocessor) {
|
if (preprocessor) {
|
||||||
await preprocessor().then(next).catch(() => {
|
await preprocessor().then(next).catch(() => {
|
||||||
this.isContinuing = false;
|
this.isContinuing = false;
|
||||||
})
|
});
|
||||||
} else {
|
} else {
|
||||||
next();
|
next();
|
||||||
}
|
}
|
||||||
@@ -115,7 +115,7 @@ class PasswordWizardCtrl {
|
|||||||
this.showSpinner = false;
|
this.showSpinner = false;
|
||||||
this.continueTitle = DEFAULT_CONTINUE_TITLE;
|
this.continueTitle = DEFAULT_CONTINUE_TITLE;
|
||||||
return success;
|
return success;
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -212,7 +212,7 @@ class PasswordWizardCtrl {
|
|||||||
if (!response || response.error) {
|
if (!response || response.error) {
|
||||||
this.alertManager.alert({
|
this.alertManager.alert({
|
||||||
text: STRING_FAILED_PASSWORD_CHANGE
|
text: STRING_FAILED_PASSWORD_CHANGE
|
||||||
})
|
});
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ class PrivilegesAuthModalCtrl {
|
|||||||
this.privilegesManager.getSelectedSessionLength().then((length) => {
|
this.privilegesManager.getSelectedSessionLength().then((length) => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.selectedSessionLength = length;
|
this.selectedSessionLength = length;
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
this.privilegesManager.netCredentialsForAction(this.action).then((credentials) => {
|
this.privilegesManager.netCredentialsForAction(this.action).then((credentials) => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.requiredCredentials = credentials.sort();
|
this.requiredCredentials = credentials.sort();
|
||||||
@@ -77,7 +77,7 @@ class PrivilegesAuthModalCtrl {
|
|||||||
} else {
|
} else {
|
||||||
this.failedCredentials = result.failedCredentials;
|
this.failedCredentials = result.failedCredentials;
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
dismiss() {
|
dismiss() {
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ class PrivilegesManagementModalCtrl {
|
|||||||
const privs = await this.privilegesManager.getPrivileges();
|
const privs = await this.privilegesManager.getPrivileges();
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.privileges = privs;
|
this.privileges = privs;
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
checkboxValueChanged(action, credential) {
|
checkboxValueChanged(action, credential) {
|
||||||
|
|||||||
@@ -99,14 +99,14 @@ class RevisionPreviewModalCtrl {
|
|||||||
this.modelManager.setItemDirty(item);
|
this.modelManager.setItemDirty(item);
|
||||||
this.syncManager.sync();
|
this.syncManager.sync();
|
||||||
this.dismiss();
|
this.dismiss();
|
||||||
}
|
};
|
||||||
|
|
||||||
if (!asCopy) {
|
if (!asCopy) {
|
||||||
this.alertManager.confirm({
|
this.alertManager.confirm({
|
||||||
text: "Are you sure you want to replace the current note's contents with what you see in this preview?",
|
text: "Are you sure you want to replace the current note's contents with what you see in this preview?",
|
||||||
destructive: true,
|
destructive: true,
|
||||||
onConfirm: run
|
onConfirm: run
|
||||||
})
|
});
|
||||||
} else {
|
} else {
|
||||||
run();
|
run();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ class SessionHistoryMenuCtrl {
|
|||||||
const history = this.sessionHistory.historyForItem(this.item);
|
const history = this.sessionHistory.historyForItem(this.item);
|
||||||
this.entries = history.entries.slice(0).sort((a, b) => {
|
this.entries = history.entries.slice(0).sort((a, b) => {
|
||||||
return a.item.updated_at < b.item.updated_at ? 1 : -1;
|
return a.item.updated_at < b.item.updated_at ? 1 : -1;
|
||||||
})
|
});
|
||||||
this.history = history;
|
this.history = history;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,10 +54,10 @@ class SessionHistoryMenuCtrl {
|
|||||||
this.sessionHistory.clearHistoryForItem(this.item).then(() => {
|
this.sessionHistory.clearHistoryForItem(this.item).then(() => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.reloadHistory();
|
this.reloadHistory();
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
clearAllHistory() {
|
clearAllHistory() {
|
||||||
@@ -68,10 +68,10 @@ class SessionHistoryMenuCtrl {
|
|||||||
this.sessionHistory.clearAllHistory().then(() => {
|
this.sessionHistory.clearAllHistory().then(() => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.reloadHistory();
|
this.reloadHistory();
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleDiskSaving() {
|
toggleDiskSaving() {
|
||||||
@@ -79,9 +79,9 @@ class SessionHistoryMenuCtrl {
|
|||||||
this.sessionHistory.toggleDiskSaving().then(() => {
|
this.sessionHistory.toggleDiskSaving().then(() => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.diskEnabled = this.sessionHistory.diskEnabled;
|
this.diskEnabled = this.sessionHistory.diskEnabled;
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
if (!this.sessionHistory.diskEnabled) {
|
if (!this.sessionHistory.diskEnabled) {
|
||||||
this.alertManager.confirm({
|
this.alertManager.confirm({
|
||||||
text: `Are you sure you want to save history to disk? This will decrease general
|
text: `Are you sure you want to save history to disk? This will decrease general
|
||||||
@@ -89,7 +89,7 @@ class SessionHistoryMenuCtrl {
|
|||||||
if you experience any lagging.`,
|
if you experience any lagging.`,
|
||||||
destructive: true,
|
destructive: true,
|
||||||
onConfirm: run
|
onConfirm: run
|
||||||
})
|
});
|
||||||
} else {
|
} else {
|
||||||
run();
|
run();
|
||||||
}
|
}
|
||||||
@@ -99,7 +99,7 @@ class SessionHistoryMenuCtrl {
|
|||||||
this.sessionHistory.toggleAutoOptimize().then(() => {
|
this.sessionHistory.toggleAutoOptimize().then(() => {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.autoOptimize = this.sessionHistory.autoOptimize;
|
this.autoOptimize = this.sessionHistory.autoOptimize;
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,13 +33,13 @@ class SyncResolutionMenuCtrl {
|
|||||||
} else {
|
} else {
|
||||||
this.status.success = true;
|
this.status.success = true;
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
close() {
|
close() {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.closeFunction()();
|
this.closeFunction()();
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ export class NoteHistoryEntry extends SFItemHistoryEntry {
|
|||||||
|
|
||||||
previewSubTitle() {
|
previewSubTitle() {
|
||||||
if(!this.hasPreviousEntry) {
|
if(!this.hasPreviousEntry) {
|
||||||
return `${this.textCharDiffLength} characters loaded`
|
return `${this.textCharDiffLength} characters loaded`;
|
||||||
} else if(this.textCharDiffLength < 0) {
|
} else if(this.textCharDiffLength < 0) {
|
||||||
return `${this.textCharDiffLength * -1} characters removed`
|
return `${this.textCharDiffLength * -1} characters removed`;
|
||||||
} else if(this.textCharDiffLength > 0) {
|
} else if(this.textCharDiffLength > 0) {
|
||||||
return `${this.textCharDiffLength} characters added`
|
return `${this.textCharDiffLength} characters added`;
|
||||||
} else {
|
} else {
|
||||||
return "Title or metadata changed"
|
return "Title or metadata changed";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ export class ActionsManager {
|
|||||||
if (response.actions) {
|
if (response.actions) {
|
||||||
extension.actions = response.actions.map((action) => {
|
extension.actions = response.actions.map((action) => {
|
||||||
return new Action(action);
|
return new Action(action);
|
||||||
})
|
});
|
||||||
} else {
|
} else {
|
||||||
extension.actions = [];
|
extension.actions = [];
|
||||||
}
|
}
|
||||||
@@ -157,7 +157,7 @@ export class ActionsManager {
|
|||||||
const result = this.decryptResponse(response, keys);
|
const result = this.decryptResponse(response, keys);
|
||||||
resolve(result);
|
resolve(result);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async handlePostAction(action, item, extension) {
|
async handlePostAction(action, item, extension) {
|
||||||
@@ -183,7 +183,7 @@ export class ActionsManager {
|
|||||||
text: "An issue occurred while processing this action. Please try again."
|
text: "An issue occurred while processing this action. Please try again."
|
||||||
});
|
});
|
||||||
return { response: response };
|
return { response: response };
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleShowAction(action) {
|
async handleShowAction(action) {
|
||||||
@@ -216,20 +216,20 @@ export class ActionsManager {
|
|||||||
};
|
};
|
||||||
}).catch((response) => {
|
}).catch((response) => {
|
||||||
const error = (response && response.error)
|
const error = (response && response.error)
|
||||||
|| { message: "An issue occurred while processing this action. Please try again." }
|
|| { message: "An issue occurred while processing this action. Please try again." };
|
||||||
this.alertManager.alert({ text: error.message });
|
this.alertManager.alert({ text: error.message });
|
||||||
action.error = true;
|
action.error = true;
|
||||||
return { error: error };
|
return { error: error };
|
||||||
})
|
});
|
||||||
}
|
};
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
this.alertManager.confirm({
|
this.alertManager.confirm({
|
||||||
text: "Are you sure you want to replace the current note contents with this action's results?",
|
text: "Are you sure you want to replace the current note contents with this action's results?",
|
||||||
onConfirm: () => {
|
onConfirm: () => {
|
||||||
onConfirm().then(resolve)
|
onConfirm().then(resolve);
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleRenderAction(action) {
|
async handleRenderAction(action) {
|
||||||
@@ -250,11 +250,11 @@ export class ActionsManager {
|
|||||||
};
|
};
|
||||||
}).catch((response) => {
|
}).catch((response) => {
|
||||||
const error = (response && response.error)
|
const error = (response && response.error)
|
||||||
|| { message: "An issue occurred while processing this action. Please try again." }
|
|| { message: "An issue occurred while processing this action. Please try again." };
|
||||||
this.alertManager.alert({ text: error.message });
|
this.alertManager.alert({ text: error.message });
|
||||||
action.error = true;
|
action.error = true;
|
||||||
return { error: error };
|
return { error: error };
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async outgoingParamsForItem(item, extension, decrypted = false) {
|
async outgoingParamsForItem(item, extension, decrypted = false) {
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export class ArchiveManager {
|
|||||||
// Match up to the first parenthesis, i.e do not include '(Central Standard Time)'
|
// Match up to the first parenthesis, i.e do not include '(Central Standard Time)'
|
||||||
var matches = string.match(/^(.*?) \(/);
|
var matches = string.match(/^(.*?) \(/);
|
||||||
if(matches.length >= 2) {
|
if(matches.length >= 2) {
|
||||||
return matches[1]
|
return matches[1];
|
||||||
}
|
}
|
||||||
return string;
|
return string;
|
||||||
}
|
}
|
||||||
@@ -113,7 +113,7 @@ export class ArchiveManager {
|
|||||||
const fileSuffix = `-${item.uuid.split("-")[0]}.txt`;
|
const fileSuffix = `-${item.uuid.split("-")[0]}.txt`;
|
||||||
// Standard max filename length is 255. Slice the note name down to allow filenameEnd
|
// Standard max filename length is 255. Slice the note name down to allow filenameEnd
|
||||||
filePrefix = filePrefix.slice(0, (255 - fileSuffix.length));
|
filePrefix = filePrefix.slice(0, (255 - fileSuffix.length));
|
||||||
const fileName = `${item.content_type}/${filePrefix}${fileSuffix}`
|
const fileName = `${item.content_type}/${filePrefix}${fileSuffix}`;
|
||||||
zipWriter.add(fileName, new zip.BlobReader(blob), () => {
|
zipWriter.add(fileName, new zip.BlobReader(blob), () => {
|
||||||
index++;
|
index++;
|
||||||
if(index < items.length) {
|
if(index < items.length) {
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ export class AuthManager extends SFAuthManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async register(url, email, password, ephemeral) {
|
async register(url, email, password, ephemeral) {
|
||||||
@@ -81,7 +81,7 @@ export class AuthManager extends SFAuthManager {
|
|||||||
this.setEphemeral(ephemeral);
|
this.setEphemeral(ephemeral);
|
||||||
}
|
}
|
||||||
return response;
|
return response;
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async changePassword(url, email, current_server_pw, newKeys, newAuthParams) {
|
async changePassword(url, email, current_server_pw, newKeys, newAuthParams) {
|
||||||
@@ -90,7 +90,7 @@ export class AuthManager extends SFAuthManager {
|
|||||||
this.checkForSecurityUpdate();
|
this.checkForSecurityUpdate();
|
||||||
}
|
}
|
||||||
return response;
|
return response;
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleAuthResponse(response, email, url, authParams, keys) {
|
async handleAuthResponse(response, email, url, authParams, keys) {
|
||||||
|
|||||||
@@ -41,13 +41,13 @@ export class DBManager {
|
|||||||
};
|
};
|
||||||
db.onerror = function(errorEvent) {
|
db.onerror = function(errorEvent) {
|
||||||
console.error("Database error: " + errorEvent.target.errorCode);
|
console.error("Database error: " + errorEvent.target.errorCode);
|
||||||
}
|
};
|
||||||
resolve(db);
|
resolve(db);
|
||||||
};
|
};
|
||||||
|
|
||||||
request.onblocked = (event) => {
|
request.onblocked = (event) => {
|
||||||
console.error("Request blocked error:", event.target.errorCode);
|
console.error("Request blocked error:", event.target.errorCode);
|
||||||
}
|
};
|
||||||
|
|
||||||
request.onupgradeneeded = (event) => {
|
request.onupgradeneeded = (event) => {
|
||||||
const db = event.target.result;
|
const db = event.target.result;
|
||||||
@@ -65,7 +65,7 @@ export class DBManager {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async getAllModels() {
|
async getAllModels() {
|
||||||
@@ -82,7 +82,7 @@ export class DBManager {
|
|||||||
resolve(items);
|
resolve(items);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async saveModel(item) {
|
async saveModel(item) {
|
||||||
@@ -92,7 +92,7 @@ export class DBManager {
|
|||||||
async saveModels(items) {
|
async saveModels(items) {
|
||||||
const showGenericError = (error) => {
|
const showGenericError = (error) => {
|
||||||
this.alertManager.alert({text: `Unable to save changes locally due to an unknown system issue. Issue Code: ${error.code} Issue Name: ${error.name}.`});
|
this.alertManager.alert({text: `Unable to save changes locally due to an unknown system issue. Issue Code: ${error.code} Issue Name: ${error.name}.`});
|
||||||
}
|
};
|
||||||
|
|
||||||
return new Promise(async (resolve, reject) => {
|
return new Promise(async (resolve, reject) => {
|
||||||
if(items.length === 0) {
|
if(items.length === 0) {
|
||||||
@@ -130,17 +130,17 @@ export class DBManager {
|
|||||||
request.onerror = (event) => {
|
request.onerror = (event) => {
|
||||||
console.error("DB put error:", event.target.error);
|
console.error("DB put error:", event.target.error);
|
||||||
resolve();
|
resolve();
|
||||||
}
|
};
|
||||||
request.onsuccess = resolve;
|
request.onsuccess = resolve;
|
||||||
})
|
});
|
||||||
}
|
};
|
||||||
|
|
||||||
for(const item of items) {
|
for(const item of items) {
|
||||||
await putItem(item);
|
await putItem(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
resolve();
|
resolve();
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async deleteModel(item) {
|
async deleteModel(item) {
|
||||||
@@ -149,11 +149,11 @@ export class DBManager {
|
|||||||
const request = db.transaction("items", "readwrite").objectStore("items").delete(item.uuid);
|
const request = db.transaction("items", "readwrite").objectStore("items").delete(item.uuid);
|
||||||
request.onsuccess = (event) => {
|
request.onsuccess = (event) => {
|
||||||
resolve();
|
resolve();
|
||||||
}
|
};
|
||||||
request.onerror = (event) => {
|
request.onerror = (event) => {
|
||||||
reject();
|
reject();
|
||||||
}
|
};
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async clearAllModels() {
|
async clearAllModels() {
|
||||||
@@ -171,9 +171,9 @@ export class DBManager {
|
|||||||
|
|
||||||
deleteRequest.onblocked = function(event) {
|
deleteRequest.onblocked = function(event) {
|
||||||
console.error("Delete request blocked");
|
console.error("Delete request blocked");
|
||||||
this.alertManager.alert({text: "Your browser is blocking Standard Notes from deleting the local database. Make sure there are no other open windows of this app and try again. If the issue persists, please manually delete app data to sign out."})
|
this.alertManager.alert({text: "Your browser is blocking Standard Notes from deleting the local database. Make sure there are no other open windows of this app and try again. If the issue persists, please manually delete app data to sign out."});
|
||||||
resolve();
|
resolve();
|
||||||
};
|
};
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ export class DesktopManager {
|
|||||||
if(this.majorDataChangeHandler) {
|
if(this.majorDataChangeHandler) {
|
||||||
this.majorDataChangeHandler();
|
this.majorDataChangeHandler();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
saveBackup() {
|
saveBackup() {
|
||||||
@@ -73,7 +73,7 @@ export class DesktopManager {
|
|||||||
return this.convertComponentForTransmission(component);
|
return this.convertComponentForTransmission(component);
|
||||||
})).then((data) => {
|
})).then((data) => {
|
||||||
this.installationSyncHandler(data);
|
this.installationSyncHandler(data);
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async installComponent(component) {
|
async installComponent(component) {
|
||||||
@@ -216,7 +216,7 @@ export class DesktopManager {
|
|||||||
nullOnEmpty
|
nullOnEmpty
|
||||||
).then((data) => {
|
).then((data) => {
|
||||||
callback(data);
|
callback(data);
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
desktop_setMajorDataChangeHandler(handler) {
|
desktop_setMajorDataChangeHandler(handler) {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ export class KeyboardManager {
|
|||||||
KeyboardManager.KeyModifierCtrl,
|
KeyboardManager.KeyModifierCtrl,
|
||||||
KeyboardManager.KeyModifierMeta,
|
KeyboardManager.KeyModifierMeta,
|
||||||
KeyboardManager.KeyModifierAlt
|
KeyboardManager.KeyModifierAlt
|
||||||
]
|
];
|
||||||
|
|
||||||
window.addEventListener('keydown', this.handleKeyDown.bind(this));
|
window.addEventListener('keydown', this.handleKeyDown.bind(this));
|
||||||
window.addEventListener('keyup', this.handleKeyUp.bind(this));
|
window.addEventListener('keyup', this.handleKeyUp.bind(this));
|
||||||
@@ -37,10 +37,10 @@ export class KeyboardManager {
|
|||||||
((event.metaKey || event.key == KeyboardManager.KeyModifierMeta) && modifier === KeyboardManager.KeyModifierMeta) ||
|
((event.metaKey || event.key == KeyboardManager.KeyModifierMeta) && modifier === KeyboardManager.KeyModifierMeta) ||
|
||||||
((event.altKey || event.key == KeyboardManager.KeyModifierAlt) && modifier === KeyboardManager.KeyModifierAlt) ||
|
((event.altKey || event.key == KeyboardManager.KeyModifierAlt) && modifier === KeyboardManager.KeyModifierAlt) ||
|
||||||
((event.shiftKey || event.key == KeyboardManager.KeyModifierShift) && modifier === KeyboardManager.KeyModifierShift)
|
((event.shiftKey || event.key == KeyboardManager.KeyModifierShift) && modifier === KeyboardManager.KeyModifierShift)
|
||||||
)
|
);
|
||||||
|
|
||||||
return matches;
|
return matches;
|
||||||
})
|
});
|
||||||
|
|
||||||
return eventModifiers;
|
return eventModifiers;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ export class MigrationManager extends SFMigrationManager {
|
|||||||
name: editor.name,
|
name: editor.name,
|
||||||
area: "editor-editor"
|
area: "editor-editor"
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
component.setAppDataItem("data", editor.data);
|
component.setAppDataItem("data", editor.data);
|
||||||
this.modelManager.addItem(component);
|
this.modelManager.addItem(component);
|
||||||
this.modelManager.setItemDirty(component, true);
|
this.modelManager.setItemDirty(component, true);
|
||||||
@@ -62,7 +62,7 @@ export class MigrationManager extends SFMigrationManager {
|
|||||||
|
|
||||||
this.syncManager.sync();
|
this.syncManager.sync();
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -99,7 +99,7 @@ export class MigrationManager extends SFMigrationManager {
|
|||||||
this.syncManager.sync();
|
this.syncManager.sync();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -167,6 +167,6 @@ export class MigrationManager extends SFMigrationManager {
|
|||||||
this.statusManager.removeStatus(status);
|
this.statusManager.removeStatus(status);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ export class ModelManager extends SFModelManager {
|
|||||||
if(!_.find(this.tags, {uuid: item.uuid})) {
|
if(!_.find(this.tags, {uuid: item.uuid})) {
|
||||||
this.tags.splice(_.sortedIndexBy(this.tags, item, function(item){
|
this.tags.splice(_.sortedIndexBy(this.tags, item, function(item){
|
||||||
if (item.title) return item.title.toLowerCase();
|
if (item.title) return item.title.toLowerCase();
|
||||||
else return ''
|
else return '';
|
||||||
}), 0, item);
|
}), 0, item);
|
||||||
}
|
}
|
||||||
} else if(item.content_type == "Note") {
|
} else if(item.content_type == "Note") {
|
||||||
@@ -78,7 +78,7 @@ export class ModelManager extends SFModelManager {
|
|||||||
_.pull(this.tags, tag);
|
_.pull(this.tags, tag);
|
||||||
this.tags.splice(_.sortedIndexBy(this.tags, tag, function(tag){
|
this.tags.splice(_.sortedIndexBy(this.tags, tag, function(tag){
|
||||||
if (tag.title) return tag.title.toLowerCase();
|
if (tag.title) return tag.title.toLowerCase();
|
||||||
else return ''
|
else return '';
|
||||||
}), 0, tag);
|
}), 0, tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ export class NativeExtManager {
|
|||||||
let packageInfo = {
|
let packageInfo = {
|
||||||
name: "Extensions",
|
name: "Extensions",
|
||||||
identifier: this.extManagerId
|
identifier: this.extManagerId
|
||||||
}
|
};
|
||||||
|
|
||||||
var item = {
|
var item = {
|
||||||
content_type: "SN|Component",
|
content_type: "SN|Component",
|
||||||
@@ -84,7 +84,7 @@ export class NativeExtManager {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
if(isDesktopApplication()) {
|
if(isDesktopApplication()) {
|
||||||
item.content.local_url = window._extensions_manager_location;
|
item.content.local_url = window._extensions_manager_location;
|
||||||
@@ -141,7 +141,7 @@ export class NativeExtManager {
|
|||||||
let packageInfo = {
|
let packageInfo = {
|
||||||
name: "Batch Manager",
|
name: "Batch Manager",
|
||||||
identifier: this.batchManagerId
|
identifier: this.batchManagerId
|
||||||
}
|
};
|
||||||
|
|
||||||
var item = {
|
var item = {
|
||||||
content_type: "SN|Component",
|
content_type: "SN|Component",
|
||||||
@@ -161,7 +161,7 @@ export class NativeExtManager {
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
if(isDesktopApplication()) {
|
if(isDesktopApplication()) {
|
||||||
item.content.local_url = window._batch_manager_location;
|
item.content.local_url = window._batch_manager_location;
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ export class PasscodeManager {
|
|||||||
} else {
|
} else {
|
||||||
resolve(true);
|
resolve(true);
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
unlock(passcode, callback) {
|
unlock(passcode, callback) {
|
||||||
@@ -110,7 +110,7 @@ export class PasscodeManager {
|
|||||||
this.decryptLocalStorage(keys, params).then(() => {
|
this.decryptLocalStorage(keys, params).then(() => {
|
||||||
this._locked = false;
|
this._locked = false;
|
||||||
callback(true);
|
callback(true);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,10 +183,10 @@ export class PasscodeManager {
|
|||||||
// desktop only
|
// desktop only
|
||||||
this.$rootScope.$on("window-lost-focus", () => {
|
this.$rootScope.$on("window-lost-focus", () => {
|
||||||
this.documentVisibilityChanged(false);
|
this.documentVisibilityChanged(false);
|
||||||
})
|
});
|
||||||
this.$rootScope.$on("window-gained-focus", () => {
|
this.$rootScope.$on("window-gained-focus", () => {
|
||||||
this.documentVisibilityChanged(true);
|
this.documentVisibilityChanged(true);
|
||||||
})
|
});
|
||||||
} else {
|
} else {
|
||||||
// tab visibility listener, web only
|
// tab visibility listener, web only
|
||||||
document.addEventListener('visibilitychange', (e) => {
|
document.addEventListener('visibilitychange', (e) => {
|
||||||
@@ -233,7 +233,7 @@ export class PasscodeManager {
|
|||||||
value: PasscodeManager.AutoLockIntervalOneHour,
|
value: PasscodeManager.AutoLockIntervalOneHour,
|
||||||
label: "1h"
|
label: "1h"
|
||||||
}
|
}
|
||||||
]
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
documentVisibilityChanged(visible) {
|
documentVisibilityChanged(visible) {
|
||||||
@@ -268,7 +268,7 @@ export class PasscodeManager {
|
|||||||
let date = new Date();
|
let date = new Date();
|
||||||
date.setSeconds(date.getSeconds() + seconds);
|
date.setSeconds(date.getSeconds() + seconds);
|
||||||
return date;
|
return date;
|
||||||
}
|
};
|
||||||
|
|
||||||
this.lockAfterDate = addToNow(interval / MillisecondsPerSecond);
|
this.lockAfterDate = addToNow(interval / MillisecondsPerSecond);
|
||||||
this.lockTimeout = setTimeout(() => {
|
this.lockTimeout = setTimeout(() => {
|
||||||
|
|||||||
@@ -50,11 +50,11 @@ export class PrivilegesManager extends SFPrivilegesManager {
|
|||||||
const customSuccess = async () => {
|
const customSuccess = async () => {
|
||||||
onSuccess && await onSuccess();
|
onSuccess && await onSuccess();
|
||||||
this.currentAuthenticationElement = null;
|
this.currentAuthenticationElement = null;
|
||||||
}
|
};
|
||||||
const customCancel = async () => {
|
const customCancel = async () => {
|
||||||
onCancel && await onCancel();
|
onCancel && await onCancel();
|
||||||
this.currentAuthenticationElement = null;
|
this.currentAuthenticationElement = null;
|
||||||
}
|
};
|
||||||
|
|
||||||
const scope = this.$rootScope.$new(true);
|
const scope = this.$rootScope.$new(true);
|
||||||
scope.action = action;
|
scope.action = action;
|
||||||
|
|||||||
@@ -12,13 +12,13 @@ export class SessionHistory extends SFSessionHistoryManager {
|
|||||||
) {
|
) {
|
||||||
SFItemHistory.HistoryEntryClassMapping = {
|
SFItemHistory.HistoryEntryClassMapping = {
|
||||||
"Note" : NoteHistoryEntry
|
"Note" : NoteHistoryEntry
|
||||||
}
|
};
|
||||||
|
|
||||||
// Session History can be encrypted with passcode keys. If it changes, we need to resave session
|
// Session History can be encrypted with passcode keys. If it changes, we need to resave session
|
||||||
// history with the new keys.
|
// history with the new keys.
|
||||||
passcodeManager.addPasscodeChangeObserver(() => {
|
passcodeManager.addPasscodeChangeObserver(() => {
|
||||||
this.saveToDisk();
|
this.saveToDisk();
|
||||||
})
|
});
|
||||||
|
|
||||||
var keyRequestHandler = async () => {
|
var keyRequestHandler = async () => {
|
||||||
let offline = authManager.offline();
|
let offline = authManager.offline();
|
||||||
@@ -29,8 +29,8 @@ export class SessionHistory extends SFSessionHistoryManager {
|
|||||||
keys: keys,
|
keys: keys,
|
||||||
offline: offline,
|
offline: offline,
|
||||||
auth_params: auth_params
|
auth_params: auth_params
|
||||||
}
|
};
|
||||||
}
|
};
|
||||||
|
|
||||||
var contentTypes = ["Note"];
|
var contentTypes = ["Note"];
|
||||||
super(
|
super(
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export class StatusManager {
|
|||||||
result += " ";
|
result += " ";
|
||||||
}
|
}
|
||||||
result += status.string;
|
result += status.string;
|
||||||
})
|
});
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ export class StorageManager extends SFStorageManager {
|
|||||||
var length = this.storage.length;
|
var length = this.storage.length;
|
||||||
for(var i = 0; i < length; i++) {
|
for(var i = 0; i < length; i++) {
|
||||||
var key = this.storage.key(i);
|
var key = this.storage.key(i);
|
||||||
hash[key] = this.storage.getItem(key)
|
hash[key] = this.storage.getItem(key);
|
||||||
}
|
}
|
||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,14 +29,14 @@ export class ThemeManager {
|
|||||||
// so that it's readable without authentication.
|
// so that it's readable without authentication.
|
||||||
passcodeManager.addPasscodeChangeObserver(() => {
|
passcodeManager.addPasscodeChangeObserver(() => {
|
||||||
this.cacheThemes();
|
this.cacheThemes();
|
||||||
})
|
});
|
||||||
|
|
||||||
if (desktopManager.isDesktop) {
|
if (desktopManager.isDesktop) {
|
||||||
appState.addObserver((eventName, data) => {
|
appState.addObserver((eventName, data) => {
|
||||||
if (eventName === APP_STATE_EVENT_DESKTOP_EXTS_READY) {
|
if (eventName === APP_STATE_EVENT_DESKTOP_EXTS_READY) {
|
||||||
this.activateCachedThemes();
|
this.activateCachedThemes();
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
} else {
|
} else {
|
||||||
this.activateCachedThemes();
|
this.activateCachedThemes();
|
||||||
}
|
}
|
||||||
@@ -59,7 +59,7 @@ export class ThemeManager {
|
|||||||
this.activateTheme(component);
|
this.activateTheme(component);
|
||||||
}, 10);
|
}, 10);
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
|
|
||||||
this.componentManager.registerHandler({
|
this.componentManager.registerHandler({
|
||||||
identifier: "themeManager",
|
identifier: "themeManager",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ export const STRING_SESSION_EXPIRED = "Your session has expired. New
|
|||||||
export const STRING_DEFAULT_FILE_ERROR = "Please use FileSafe or the Bold Editor to attach images and files. Learn more at standardnotes.org/filesafe.";
|
export const STRING_DEFAULT_FILE_ERROR = "Please use FileSafe or the Bold Editor to attach images and files. Learn more at standardnotes.org/filesafe.";
|
||||||
export const STRING_GENERIC_SYNC_ERROR = "There was an error syncing. Please try again. If all else fails, try signing out and signing back in.";
|
export const STRING_GENERIC_SYNC_ERROR = "There was an error syncing. Please try again. If all else fails, try signing out and signing back in.";
|
||||||
export function StringSyncException(data) {
|
export function StringSyncException(data) {
|
||||||
return `There was an error while trying to save your items. Please contact support and share this message: ${data}.`
|
return `There was an error while trying to save your items. Please contact support and share this message: ${data}.`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @footer */
|
/** @footer */
|
||||||
|
|||||||
Reference in New Issue
Block a user