chore: rename editor model to note controller
This commit is contained in:
@@ -2,7 +2,7 @@ import { Bridge } from '@/services/bridge';
|
|||||||
import { storage, StorageKey } from '@/services/localStorage';
|
import { storage, StorageKey } from '@/services/localStorage';
|
||||||
import { WebApplication } from '@/ui_models/application';
|
import { WebApplication } from '@/ui_models/application';
|
||||||
import { AccountMenuState } from '@/ui_models/app_state/account_menu_state';
|
import { AccountMenuState } from '@/ui_models/app_state/account_menu_state';
|
||||||
import { Editor } from '@/ui_models/editor';
|
import { NoteController } from '@/ui_models/note_controller';
|
||||||
import { isDesktopApplication } from '@/utils';
|
import { isDesktopApplication } from '@/utils';
|
||||||
import {
|
import {
|
||||||
ApplicationEvent,
|
ApplicationEvent,
|
||||||
@@ -226,9 +226,9 @@ export class AppState {
|
|||||||
storage.set(StorageKey.ShowBetaWarning, true);
|
storage.set(StorageKey.ShowBetaWarning, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
async createEditor(title?: string) {
|
async openNewNote(title?: string) {
|
||||||
if (!this.multiEditorSupport) {
|
if (!this.multiEditorSupport) {
|
||||||
this.closeActiveEditor();
|
this.closeActiveNoteController();
|
||||||
}
|
}
|
||||||
const activeTagUuid = this.selectedTag
|
const activeTagUuid = this.selectedTag
|
||||||
? this.selectedTag.isSmartTag
|
? this.selectedTag.isSmartTag
|
||||||
@@ -236,37 +236,37 @@ export class AppState {
|
|||||||
: this.selectedTag.uuid
|
: this.selectedTag.uuid
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
await this.application.editorGroup.createEditor(
|
await this.application.noteControllerGroup.createNoteController(
|
||||||
undefined,
|
undefined,
|
||||||
title,
|
title,
|
||||||
activeTagUuid
|
activeTagUuid
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
getActiveEditor() {
|
getActiveNoteController() {
|
||||||
return this.application.editorGroup.editors[0];
|
return this.application.noteControllerGroup.noteControllers[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
getEditors() {
|
getNoteControllers() {
|
||||||
return this.application.editorGroup.editors;
|
return this.application.noteControllerGroup.noteControllers;
|
||||||
}
|
}
|
||||||
|
|
||||||
closeEditor(editor: Editor) {
|
closeNoteController(controller: NoteController) {
|
||||||
this.application.editorGroup.closeEditor(editor);
|
this.application.noteControllerGroup.closeController(controller);
|
||||||
}
|
}
|
||||||
|
|
||||||
closeActiveEditor() {
|
closeActiveNoteController() {
|
||||||
this.application.editorGroup.closeActiveEditor();
|
this.application.noteControllerGroup.closeActiveController();
|
||||||
}
|
}
|
||||||
|
|
||||||
closeAllEditors() {
|
closeAllNoteControllers() {
|
||||||
this.application.editorGroup.closeAllEditors();
|
this.application.noteControllerGroup.closeAllControllers();
|
||||||
}
|
}
|
||||||
|
|
||||||
editorForNote(note: SNNote) {
|
noteControllerForNote(note: SNNote) {
|
||||||
for (const editor of this.getEditors()) {
|
for (const controller of this.getNoteControllers()) {
|
||||||
if (editor.note.uuid === note.uuid) {
|
if (controller.note.uuid === note.uuid) {
|
||||||
return editor;
|
return controller;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -275,31 +275,31 @@ export class AppState {
|
|||||||
this.application.streamItems(
|
this.application.streamItems(
|
||||||
[ContentType.Note, ContentType.Tag],
|
[ContentType.Note, ContentType.Tag],
|
||||||
async (items, source) => {
|
async (items, source) => {
|
||||||
/** Close any editors for deleted/trashed/archived notes */
|
/** Close any note controllers for deleted/trashed/archived notes */
|
||||||
if (source === PayloadSource.PreSyncSave) {
|
if (source === PayloadSource.PreSyncSave) {
|
||||||
const notes = items.filter(
|
const notes = items.filter(
|
||||||
(candidate) => candidate.content_type === ContentType.Note
|
(candidate) => candidate.content_type === ContentType.Note
|
||||||
) as SNNote[];
|
) as SNNote[];
|
||||||
for (const note of notes) {
|
for (const note of notes) {
|
||||||
const editor = this.editorForNote(note);
|
const noteController = this.noteControllerForNote(note);
|
||||||
if (!editor) {
|
if (!noteController) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (note.deleted) {
|
if (note.deleted) {
|
||||||
this.closeEditor(editor);
|
this.closeNoteController(noteController);
|
||||||
} else if (
|
} else if (
|
||||||
note.trashed &&
|
note.trashed &&
|
||||||
!this.selectedTag?.isTrashTag &&
|
!this.selectedTag?.isTrashTag &&
|
||||||
!this.searchOptions.includeTrashed
|
!this.searchOptions.includeTrashed
|
||||||
) {
|
) {
|
||||||
this.closeEditor(editor);
|
this.closeNoteController(noteController);
|
||||||
} else if (
|
} else if (
|
||||||
note.archived &&
|
note.archived &&
|
||||||
!this.selectedTag?.isArchiveTag &&
|
!this.selectedTag?.isArchiveTag &&
|
||||||
!this.searchOptions.includeArchived &&
|
!this.searchOptions.includeArchived &&
|
||||||
!this.application.getPreference(PrefKey.NotesShowArchived, false)
|
!this.application.getPreference(PrefKey.NotesShowArchived, false)
|
||||||
) {
|
) {
|
||||||
this.closeEditor(editor);
|
this.closeNoteController(noteController);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export class NoteTagsState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get activeNote(): SNNote | undefined {
|
get activeNote(): SNNote | undefined {
|
||||||
return this.appState.notes.activeEditor?.note;
|
return this.appState.notes.activeNoteController?.note;
|
||||||
}
|
}
|
||||||
|
|
||||||
get autocompleteTagHintVisible(): boolean {
|
get autocompleteTagHintVisible(): boolean {
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import {
|
|||||||
runInAction,
|
runInAction,
|
||||||
} from 'mobx';
|
} from 'mobx';
|
||||||
import { WebApplication } from '../application';
|
import { WebApplication } from '../application';
|
||||||
import { Editor } from '../editor';
|
import { NoteController } from '../note_controller';
|
||||||
import { AppState } from './app_state';
|
import { AppState } from './app_state';
|
||||||
|
|
||||||
export class NotesState {
|
export class NotesState {
|
||||||
@@ -68,8 +68,8 @@ export class NotesState {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
get activeEditor(): Editor | undefined {
|
get activeNoteController(): NoteController | undefined {
|
||||||
return this.application.editorGroup.editors[0];
|
return this.application.noteControllerGroup.noteControllers[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
get selectedNotesCount(): number {
|
get selectedNotesCount(): number {
|
||||||
@@ -151,13 +151,13 @@ export class NotesState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.selectedNotesCount === 1) {
|
if (this.selectedNotesCount === 1) {
|
||||||
await this.openEditor(Object.keys(this.selectedNotes)[0]);
|
await this.openNote(Object.keys(this.selectedNotes)[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async openEditor(noteUuid: string): Promise<void> {
|
private async openNote(noteUuid: string): Promise<void> {
|
||||||
if (this.activeEditor?.note?.uuid === noteUuid) {
|
if (this.activeNoteController?.note?.uuid === noteUuid) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -167,11 +167,11 @@ export class NotesState {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.activeEditor) {
|
if (this.activeNoteController) {
|
||||||
this.application.editorGroup.closeActiveEditor();
|
this.application.noteControllerGroup.closeActiveController();
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.application.editorGroup.createEditor(noteUuid);
|
await this.application.noteControllerGroup.createNoteController(noteUuid);
|
||||||
|
|
||||||
this.appState.noteTags.reloadTags();
|
this.appState.noteTags.reloadTags();
|
||||||
await this.onActiveEditorChanged();
|
await this.onActiveEditorChanged();
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ export class NotesViewState {
|
|||||||
appObservers.push(
|
appObservers.push(
|
||||||
application.streamItems(ContentType.Note, () => {
|
application.streamItems(ContentType.Note, () => {
|
||||||
this.reloadNotes();
|
this.reloadNotes();
|
||||||
const activeNote = this.appState.notes.activeEditor?.note;
|
const activeNote = this.appState.notes.activeNoteController?.note;
|
||||||
if (this.application.getAppState().notes.selectedNotesCount < 2) {
|
if (this.application.getAppState().notes.selectedNotesCount < 2) {
|
||||||
if (activeNote) {
|
if (activeNote) {
|
||||||
const discarded = activeNote.deleted || activeNote.trashed;
|
const discarded = activeNote.deleted || activeNote.trashed;
|
||||||
@@ -102,7 +102,7 @@ export class NotesViewState {
|
|||||||
this.reloadPreferences();
|
this.reloadPreferences();
|
||||||
}, ApplicationEvent.PreferencesChanged),
|
}, ApplicationEvent.PreferencesChanged),
|
||||||
application.addEventObserver(async () => {
|
application.addEventObserver(async () => {
|
||||||
this.appState.closeAllEditors();
|
this.appState.closeAllNoteControllers();
|
||||||
this.selectFirstNote();
|
this.selectFirstNote();
|
||||||
this.setCompletedFullSync(false);
|
this.setCompletedFullSync(false);
|
||||||
}, ApplicationEvent.SignedIn),
|
}, ApplicationEvent.SignedIn),
|
||||||
@@ -112,7 +112,7 @@ export class NotesViewState {
|
|||||||
this.notes.length === 0 &&
|
this.notes.length === 0 &&
|
||||||
this.appState.selectedTag?.isAllTag &&
|
this.appState.selectedTag?.isAllTag &&
|
||||||
this.noteFilterText === '' &&
|
this.noteFilterText === '' &&
|
||||||
!this.appState.notes.activeEditor
|
!this.appState.notes.activeNoteController
|
||||||
) {
|
) {
|
||||||
this.createPlaceholderNote();
|
this.createPlaceholderNote();
|
||||||
}
|
}
|
||||||
@@ -192,7 +192,7 @@ export class NotesViewState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get activeEditorNote() {
|
get activeEditorNote() {
|
||||||
return this.appState.notes.activeEditor?.note;
|
return this.appState.notes.activeNoteController?.note;
|
||||||
}
|
}
|
||||||
|
|
||||||
reloadPanelTitle = () => {
|
reloadPanelTitle = () => {
|
||||||
@@ -325,7 +325,7 @@ export class NotesViewState {
|
|||||||
if (this.isFiltering) {
|
if (this.isFiltering) {
|
||||||
title = this.noteFilterText;
|
title = this.noteFilterText;
|
||||||
}
|
}
|
||||||
await this.appState.createEditor(title);
|
await this.appState.openNewNote(title);
|
||||||
this.reloadNotes();
|
this.reloadNotes();
|
||||||
this.appState.noteTags.reloadTags();
|
this.appState.noteTags.reloadTags();
|
||||||
};
|
};
|
||||||
@@ -433,7 +433,7 @@ export class NotesViewState {
|
|||||||
if (note) {
|
if (note) {
|
||||||
this.selectNote(note, false, false);
|
this.selectNote(note, false, false);
|
||||||
} else {
|
} else {
|
||||||
this.appState.closeActiveEditor();
|
this.appState.closeActiveNoteController();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -464,7 +464,7 @@ export class NotesViewState {
|
|||||||
};
|
};
|
||||||
|
|
||||||
handleEditorChange = async () => {
|
handleEditorChange = async () => {
|
||||||
const activeNote = this.appState.getActiveEditor()?.note;
|
const activeNote = this.appState.getActiveNoteController()?.note;
|
||||||
if (activeNote && activeNote.conflictOf) {
|
if (activeNote && activeNote.conflictOf) {
|
||||||
this.application.changeAndSaveItem(activeNote.uuid, (mutator) => {
|
this.application.changeAndSaveItem(activeNote.uuid, (mutator) => {
|
||||||
mutator.conflictOf = undefined;
|
mutator.conflictOf = undefined;
|
||||||
@@ -502,7 +502,7 @@ export class NotesViewState {
|
|||||||
this.activeEditorNote &&
|
this.activeEditorNote &&
|
||||||
!this.notes.includes(this.activeEditorNote)
|
!this.notes.includes(this.activeEditorNote)
|
||||||
) {
|
) {
|
||||||
this.appState.closeActiveEditor();
|
this.appState.closeActiveNoteController();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { StatusManager } from '@/services/statusManager';
|
|||||||
import { ThemeManager } from '@/services/themeManager';
|
import { ThemeManager } from '@/services/themeManager';
|
||||||
import { PasswordWizardScope, PasswordWizardType } from '@/types';
|
import { PasswordWizardScope, PasswordWizardType } from '@/types';
|
||||||
import { AppState } from '@/ui_models/app_state';
|
import { AppState } from '@/ui_models/app_state';
|
||||||
import { EditorGroup } from '@/ui_models/editor_group';
|
import { NoteControllerGroup } from '@/ui_models/note_controller_group';
|
||||||
import { AppVersion } from '@/version';
|
import { AppVersion } from '@/version';
|
||||||
import { WebDeviceInterface } from '@/web_device_interface';
|
import { WebDeviceInterface } from '@/web_device_interface';
|
||||||
import {
|
import {
|
||||||
@@ -36,7 +36,7 @@ export class WebApplication extends SNApplication {
|
|||||||
private scope?: angular.IScope;
|
private scope?: angular.IScope;
|
||||||
private webServices!: WebServices;
|
private webServices!: WebServices;
|
||||||
private currentAuthenticationElement?: angular.IRootElementService;
|
private currentAuthenticationElement?: angular.IRootElementService;
|
||||||
public editorGroup: EditorGroup;
|
public noteControllerGroup: NoteControllerGroup;
|
||||||
|
|
||||||
/* @ngInject */
|
/* @ngInject */
|
||||||
constructor(
|
constructor(
|
||||||
@@ -66,7 +66,7 @@ export class WebApplication extends SNApplication {
|
|||||||
this.$compile = $compile;
|
this.$compile = $compile;
|
||||||
this.scope = scope;
|
this.scope = scope;
|
||||||
deviceInterface.setApplication(this);
|
deviceInterface.setApplication(this);
|
||||||
this.editorGroup = new EditorGroup(this);
|
this.noteControllerGroup = new NoteControllerGroup(this);
|
||||||
this.presentPermissionsDialog = this.presentPermissionsDialog.bind(this);
|
this.presentPermissionsDialog = this.presentPermissionsDialog.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -80,7 +80,7 @@ export class WebApplication extends SNApplication {
|
|||||||
}
|
}
|
||||||
this.webServices = {} as WebServices;
|
this.webServices = {} as WebServices;
|
||||||
(this.$compile as unknown) = undefined;
|
(this.$compile as unknown) = undefined;
|
||||||
this.editorGroup.deinit();
|
this.noteControllerGroup.deinit();
|
||||||
(this.scope as any).application = undefined;
|
(this.scope as any).application = undefined;
|
||||||
this.scope!.$destroy();
|
this.scope!.$destroy();
|
||||||
this.scope = undefined;
|
this.scope = undefined;
|
||||||
|
|||||||
@@ -1,79 +0,0 @@
|
|||||||
import { removeFromArray, UuidString } from '@standardnotes/snjs';
|
|
||||||
import { Editor } from './editor';
|
|
||||||
import { WebApplication } from './application';
|
|
||||||
|
|
||||||
type EditorGroupChangeCallback = () => void;
|
|
||||||
|
|
||||||
export class EditorGroup {
|
|
||||||
public editors: Editor[] = [];
|
|
||||||
private application: WebApplication;
|
|
||||||
changeObservers: EditorGroupChangeCallback[] = [];
|
|
||||||
|
|
||||||
constructor(application: WebApplication) {
|
|
||||||
this.application = application;
|
|
||||||
}
|
|
||||||
|
|
||||||
public deinit() {
|
|
||||||
(this.application as unknown) = undefined;
|
|
||||||
for (const editor of this.editors) {
|
|
||||||
this.deleteEditor(editor);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async createEditor(
|
|
||||||
noteUuid?: string,
|
|
||||||
noteTitle?: string,
|
|
||||||
noteTag?: UuidString
|
|
||||||
) {
|
|
||||||
const editor = new Editor(this.application, noteUuid, noteTitle, noteTag);
|
|
||||||
await editor.initialize();
|
|
||||||
this.editors.push(editor);
|
|
||||||
this.notifyObservers();
|
|
||||||
}
|
|
||||||
|
|
||||||
deleteEditor(editor: Editor) {
|
|
||||||
editor.deinit();
|
|
||||||
removeFromArray(this.editors, editor);
|
|
||||||
}
|
|
||||||
|
|
||||||
closeEditor(editor: Editor) {
|
|
||||||
this.deleteEditor(editor);
|
|
||||||
this.notifyObservers();
|
|
||||||
}
|
|
||||||
|
|
||||||
closeActiveEditor() {
|
|
||||||
const activeEditor = this.activeEditor;
|
|
||||||
if (activeEditor) {
|
|
||||||
this.deleteEditor(activeEditor);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
closeAllEditors() {
|
|
||||||
for (const editor of this.editors) {
|
|
||||||
this.deleteEditor(editor);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
get activeEditor() {
|
|
||||||
return this.editors[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Notifies observer when the active editor has changed.
|
|
||||||
*/
|
|
||||||
public addChangeObserver(callback: EditorGroupChangeCallback) {
|
|
||||||
this.changeObservers.push(callback);
|
|
||||||
if (this.activeEditor) {
|
|
||||||
callback();
|
|
||||||
}
|
|
||||||
return () => {
|
|
||||||
removeFromArray(this.changeObservers, callback);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private notifyObservers() {
|
|
||||||
for (const observer of this.changeObservers) {
|
|
||||||
observer();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,7 +7,7 @@ import {
|
|||||||
} from '@standardnotes/snjs';
|
} from '@standardnotes/snjs';
|
||||||
import { WebApplication } from './application';
|
import { WebApplication } from './application';
|
||||||
|
|
||||||
export class Editor {
|
export class NoteController {
|
||||||
public note!: SNNote;
|
public note!: SNNote;
|
||||||
private application: WebApplication;
|
private application: WebApplication;
|
||||||
private onNoteValueChange?: (note: SNNote, source: PayloadSource) => void;
|
private onNoteValueChange?: (note: SNNote, source: PayloadSource) => void;
|
||||||
@@ -28,7 +28,21 @@ export class Editor {
|
|||||||
|
|
||||||
async initialize(): Promise<void> {
|
async initialize(): Promise<void> {
|
||||||
if (!this.note) {
|
if (!this.note) {
|
||||||
await this.createTemplateNote(this.defaultTitle, this.defaultTag);
|
const note = (await this.application.createTemplateItem(
|
||||||
|
ContentType.Note,
|
||||||
|
{
|
||||||
|
text: '',
|
||||||
|
title: this.defaultTitle,
|
||||||
|
references: [],
|
||||||
|
}
|
||||||
|
)) as SNNote;
|
||||||
|
if (this.defaultTag) {
|
||||||
|
const tag = this.application.findItem(this.defaultTag) as SNTag;
|
||||||
|
await this.application.addTagHierarchyToNote(note, tag);
|
||||||
|
}
|
||||||
|
this.isTemplateNote = true;
|
||||||
|
this.note = note;
|
||||||
|
this.onNoteValueChange?.(this.note, this.note.payload.source);
|
||||||
}
|
}
|
||||||
this.streamItems();
|
this.streamItems();
|
||||||
}
|
}
|
||||||
@@ -67,29 +81,10 @@ export class Editor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reverts the editor to a blank state, removing any existing note from view,
|
* Register to be notified when the controller's note's inner values change
|
||||||
* and creating a placeholder note.
|
|
||||||
*/
|
|
||||||
async createTemplateNote(defaultTitle?: string, noteTag?: UuidString) {
|
|
||||||
const note = (await this.application.createTemplateItem(ContentType.Note, {
|
|
||||||
text: '',
|
|
||||||
title: defaultTitle,
|
|
||||||
references: [],
|
|
||||||
})) as SNNote;
|
|
||||||
if (noteTag) {
|
|
||||||
const tag = this.application.findItem(noteTag) as SNTag;
|
|
||||||
await this.application.addTagHierarchyToNote(note, tag);
|
|
||||||
}
|
|
||||||
this.isTemplateNote = true;
|
|
||||||
this.note = note;
|
|
||||||
this.onNoteValueChange?.(this.note, this.note.payload.source);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register to be notified when the editor's note's values change
|
|
||||||
* (and thus a new object reference is created)
|
* (and thus a new object reference is created)
|
||||||
*/
|
*/
|
||||||
public setOnNoteValueChange(
|
public setOnNoteInnerValueChange(
|
||||||
callback: (note: SNNote, source: PayloadSource) => void
|
callback: (note: SNNote, source: PayloadSource) => void
|
||||||
) {
|
) {
|
||||||
this.onNoteValueChange = callback;
|
this.onNoteValueChange = callback;
|
||||||
84
app/assets/javascripts/ui_models/note_controller_group.ts
Normal file
84
app/assets/javascripts/ui_models/note_controller_group.ts
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
import { removeFromArray, UuidString } from '@standardnotes/snjs';
|
||||||
|
import { NoteController } from './note_controller';
|
||||||
|
import { WebApplication } from './application';
|
||||||
|
|
||||||
|
type NoteControllerGroupChangeCallback = () => void;
|
||||||
|
|
||||||
|
export class NoteControllerGroup {
|
||||||
|
public noteControllers: NoteController[] = [];
|
||||||
|
private application: WebApplication;
|
||||||
|
changeObservers: NoteControllerGroupChangeCallback[] = [];
|
||||||
|
|
||||||
|
constructor(application: WebApplication) {
|
||||||
|
this.application = application;
|
||||||
|
}
|
||||||
|
|
||||||
|
public deinit() {
|
||||||
|
(this.application as unknown) = undefined;
|
||||||
|
for (const controller of this.noteControllers) {
|
||||||
|
this.deleteController(controller);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async createNoteController(
|
||||||
|
noteUuid?: string,
|
||||||
|
noteTitle?: string,
|
||||||
|
noteTag?: UuidString
|
||||||
|
) {
|
||||||
|
const controller = new NoteController(
|
||||||
|
this.application,
|
||||||
|
noteUuid,
|
||||||
|
noteTitle,
|
||||||
|
noteTag
|
||||||
|
);
|
||||||
|
await controller.initialize();
|
||||||
|
this.noteControllers.push(controller);
|
||||||
|
this.notifyObservers();
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteController(controller: NoteController) {
|
||||||
|
controller.deinit();
|
||||||
|
removeFromArray(this.noteControllers, controller);
|
||||||
|
}
|
||||||
|
|
||||||
|
closeController(controller: NoteController) {
|
||||||
|
this.deleteController(controller);
|
||||||
|
this.notifyObservers();
|
||||||
|
}
|
||||||
|
|
||||||
|
closeActiveController() {
|
||||||
|
const activeController = this.activeNoteController;
|
||||||
|
if (activeController) {
|
||||||
|
this.deleteController(activeController);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
closeAllControllers() {
|
||||||
|
for (const controller of this.noteControllers) {
|
||||||
|
this.deleteController(controller);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
get activeNoteController() {
|
||||||
|
return this.noteControllers[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Notifies observer when the active controller has changed.
|
||||||
|
*/
|
||||||
|
public addChangeObserver(callback: NoteControllerGroupChangeCallback) {
|
||||||
|
this.changeObservers.push(callback);
|
||||||
|
if (this.activeNoteController) {
|
||||||
|
callback();
|
||||||
|
}
|
||||||
|
return () => {
|
||||||
|
removeFromArray(this.changeObservers, callback);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private notifyObservers() {
|
||||||
|
for (const observer of this.changeObservers) {
|
||||||
|
observer();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -114,7 +114,7 @@
|
|||||||
component-view.component-view(
|
component-view.component-view(
|
||||||
component-viewer='self.state.editorComponentViewer',
|
component-viewer='self.state.editorComponentViewer',
|
||||||
ng-if='self.state.editorComponentViewer',
|
ng-if='self.state.editorComponentViewer',
|
||||||
on-load='self.onEditorLoad',
|
on-load='self.onEditorComponentLoad',
|
||||||
request-reload='self.editorComponentViewerRequestsReload'
|
request-reload='self.editorComponentViewerRequestsReload'
|
||||||
application='self.application'
|
application='self.application'
|
||||||
app-state='self.appState'
|
app-state='self.appState'
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { STRING_SAVING_WHILE_DOCUMENT_HIDDEN } from './../../strings';
|
import { STRING_SAVING_WHILE_DOCUMENT_HIDDEN } from './../../strings';
|
||||||
import { Editor } from '@/ui_models/editor';
|
import { NoteController } from '@/ui_models/note_controller';
|
||||||
import { WebApplication } from '@/ui_models/application';
|
import { WebApplication } from '@/ui_models/application';
|
||||||
import { PanelPuppet, WebDirective } from '@/types';
|
import { PanelPuppet, WebDirective } from '@/types';
|
||||||
import angular from 'angular';
|
import angular from 'angular';
|
||||||
@@ -93,7 +93,7 @@ function sortAlphabetically(array: SNComponent[]): SNComponent[] {
|
|||||||
export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
||||||
/** Passed through template */
|
/** Passed through template */
|
||||||
readonly application!: WebApplication;
|
readonly application!: WebApplication;
|
||||||
readonly editor!: Editor;
|
readonly controller!: NoteController;
|
||||||
|
|
||||||
private leftPanelPuppet?: PanelPuppet;
|
private leftPanelPuppet?: PanelPuppet;
|
||||||
private rightPanelPuppet?: PanelPuppet;
|
private rightPanelPuppet?: PanelPuppet;
|
||||||
@@ -101,7 +101,7 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
private statusTimeout?: ng.IPromise<void>;
|
private statusTimeout?: ng.IPromise<void>;
|
||||||
private lastEditorFocusEventSource?: EventSource;
|
private lastEditorFocusEventSource?: EventSource;
|
||||||
public editorValues: EditorValues = { title: '', text: '' };
|
public editorValues: EditorValues = { title: '', text: '' };
|
||||||
onEditorLoad?: () => void;
|
onEditorComponentLoad?: () => void;
|
||||||
|
|
||||||
private scrollPosition = 0;
|
private scrollPosition = 0;
|
||||||
private removeTrashKeyObserver?: () => void;
|
private removeTrashKeyObserver?: () => void;
|
||||||
@@ -127,7 +127,7 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
this.resetScrollPosition = this.resetScrollPosition.bind(this);
|
this.resetScrollPosition = this.resetScrollPosition.bind(this);
|
||||||
this.editorComponentViewerRequestsReload =
|
this.editorComponentViewerRequestsReload =
|
||||||
this.editorComponentViewerRequestsReload.bind(this);
|
this.editorComponentViewerRequestsReload.bind(this);
|
||||||
this.onEditorLoad = () => {
|
this.onEditorComponentLoad = () => {
|
||||||
this.application.getDesktopService().redoSearch();
|
this.application.getDesktopService().redoSearch();
|
||||||
};
|
};
|
||||||
this.debounceReloadEditorComponent = debounce(
|
this.debounceReloadEditorComponent = debounce(
|
||||||
@@ -148,7 +148,7 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
this.removeTabObserver = undefined;
|
this.removeTabObserver = undefined;
|
||||||
this.leftPanelPuppet = undefined;
|
this.leftPanelPuppet = undefined;
|
||||||
this.rightPanelPuppet = undefined;
|
this.rightPanelPuppet = undefined;
|
||||||
this.onEditorLoad = undefined;
|
this.onEditorComponentLoad = undefined;
|
||||||
this.saveTimeout = undefined;
|
this.saveTimeout = undefined;
|
||||||
this.statusTimeout = undefined;
|
this.statusTimeout = undefined;
|
||||||
(this.onPanelResizeFinish as unknown) = undefined;
|
(this.onPanelResizeFinish as unknown) = undefined;
|
||||||
@@ -161,14 +161,14 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get note() {
|
get note() {
|
||||||
return this.editor.note;
|
return this.controller.note;
|
||||||
}
|
}
|
||||||
|
|
||||||
$onInit() {
|
$onInit() {
|
||||||
super.$onInit();
|
super.$onInit();
|
||||||
this.registerKeyboardShortcuts();
|
this.registerKeyboardShortcuts();
|
||||||
this.editor.setOnNoteValueChange((note, source) => {
|
this.controller.setOnNoteInnerValueChange((note, source) => {
|
||||||
this.onNoteChanges(note, source);
|
this.onNoteInnerChange(note, source);
|
||||||
});
|
});
|
||||||
this.autorun(() => {
|
this.autorun(() => {
|
||||||
this.setState({
|
this.setState({
|
||||||
@@ -184,14 +184,14 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
|
|
||||||
this.reloadPreferences();
|
this.reloadPreferences();
|
||||||
|
|
||||||
if (this.editor.isTemplateNote) {
|
if (this.controller.isTemplateNote) {
|
||||||
this.$timeout(() => {
|
this.$timeout(() => {
|
||||||
this.focusTitle();
|
this.focusTitle();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private onNoteChanges(note: SNNote, source: PayloadSource): void {
|
private onNoteInnerChange(note: SNNote, source: PayloadSource): void {
|
||||||
if (note.uuid !== this.note.uuid) {
|
if (note.uuid !== this.note.uuid) {
|
||||||
throw Error('Editor received changes for non-current note');
|
throw Error('Editor received changes for non-current note');
|
||||||
}
|
}
|
||||||
@@ -423,8 +423,8 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
this.note
|
this.note
|
||||||
);
|
);
|
||||||
/** Editors cannot interact with template notes so the note must be inserted */
|
/** Editors cannot interact with template notes so the note must be inserted */
|
||||||
if (newEditor && this.editor.isTemplateNote) {
|
if (newEditor && this.controller.isTemplateNote) {
|
||||||
await this.editor.insertTemplatedNote();
|
await this.controller.insertTemplatedNote();
|
||||||
this.associateComponentWithCurrentNote(newEditor);
|
this.associateComponentWithCurrentNote(newEditor);
|
||||||
}
|
}
|
||||||
const currentComponentViewer = this.state.editorComponentViewer;
|
const currentComponentViewer = this.state.editorComponentViewer;
|
||||||
@@ -479,8 +479,8 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
const transactions: TransactionalMutation[] = [];
|
const transactions: TransactionalMutation[] = [];
|
||||||
|
|
||||||
this.setMenuState('showEditorMenu', false);
|
this.setMenuState('showEditorMenu', false);
|
||||||
if (this.appState.getActiveEditor()?.isTemplateNote) {
|
if (this.appState.getActiveNoteController()?.isTemplateNote) {
|
||||||
await this.appState.getActiveEditor().insertTemplatedNote();
|
await this.appState.getActiveNoteController().insertTemplatedNote();
|
||||||
}
|
}
|
||||||
if (this.note.locked) {
|
if (this.note.locked) {
|
||||||
this.application.alertService.alert(STRING_EDIT_LOCKED_ATTEMPT);
|
this.application.alertService.alert(STRING_EDIT_LOCKED_ATTEMPT);
|
||||||
@@ -566,7 +566,7 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
) {
|
) {
|
||||||
const title = editorValues.title;
|
const title = editorValues.title;
|
||||||
const text = editorValues.text;
|
const text = editorValues.text;
|
||||||
const isTemplate = this.editor.isTemplateNote;
|
const isTemplate = this.controller.isTemplateNote;
|
||||||
if (document.hidden) {
|
if (document.hidden) {
|
||||||
this.application.alertService.alert(STRING_SAVING_WHILE_DOCUMENT_HIDDEN);
|
this.application.alertService.alert(STRING_SAVING_WHILE_DOCUMENT_HIDDEN);
|
||||||
return;
|
return;
|
||||||
@@ -576,7 +576,7 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (isTemplate) {
|
if (isTemplate) {
|
||||||
await this.editor.insertTemplatedNote();
|
await this.controller.insertTemplatedNote();
|
||||||
}
|
}
|
||||||
if (!this.application.findItem(note.uuid)) {
|
if (!this.application.findItem(note.uuid)) {
|
||||||
this.application.alertService.alert(STRING_INVALID_NOTE);
|
this.application.alertService.alert(STRING_INVALID_NOTE);
|
||||||
@@ -614,7 +614,7 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
this.saveTimeout = this.$timeout(() => {
|
this.saveTimeout = this.$timeout(() => {
|
||||||
this.application.sync();
|
this.application.sync();
|
||||||
if (closeAfterSync) {
|
if (closeAfterSync) {
|
||||||
this.appState.closeEditor(this.editor);
|
this.appState.closeNoteController(this.controller);
|
||||||
}
|
}
|
||||||
}, syncDebouceMs);
|
}, syncDebouceMs);
|
||||||
}
|
}
|
||||||
@@ -719,7 +719,7 @@ export class EditorViewCtrl extends PureViewCtrl<unknown, EditorState> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async deleteNote(permanently: boolean) {
|
async deleteNote(permanently: boolean) {
|
||||||
if (this.editor.isTemplateNote) {
|
if (this.controller.isTemplateNote) {
|
||||||
this.application.alertService.alert(STRING_DELETE_PLACEHOLDER_ATTEMPT);
|
this.application.alertService.alert(STRING_DELETE_PLACEHOLDER_ATTEMPT);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1044,7 +1044,7 @@ export class EditorView extends WebDirective {
|
|||||||
super();
|
super();
|
||||||
this.restrict = 'E';
|
this.restrict = 'E';
|
||||||
this.scope = {
|
this.scope = {
|
||||||
editor: '=',
|
controller: '=',
|
||||||
application: '=',
|
application: '=',
|
||||||
};
|
};
|
||||||
this.template = template;
|
this.template = template;
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
)
|
)
|
||||||
.flex-grow.h-full(
|
.flex-grow.h-full(
|
||||||
ng-if='!self.state.showMultipleSelectedNotes'
|
ng-if='!self.state.showMultipleSelectedNotes'
|
||||||
ng-repeat='editor in self.editors'
|
ng-repeat='controller in self.controllers'
|
||||||
)
|
)
|
||||||
editor-view(
|
editor-view(
|
||||||
application='self.application'
|
application='self.application'
|
||||||
editor='editor'
|
controller='controller'
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,29 +1,31 @@
|
|||||||
import { WebDirective } from './../../types';
|
import { WebDirective } from './../../types';
|
||||||
import template from './editor-group-view.pug';
|
import template from './editor-group-view.pug';
|
||||||
import { Editor } from '@/ui_models/editor';
|
import { NoteController } from '@/ui_models/note_controller';
|
||||||
import { PureViewCtrl } from '../abstract/pure_view_ctrl';
|
import { PureViewCtrl } from '../abstract/pure_view_ctrl';
|
||||||
|
|
||||||
class EditorGroupViewCtrl extends PureViewCtrl<unknown, {
|
class EditorGroupViewCtrl extends PureViewCtrl<
|
||||||
showMultipleSelectedNotes: boolean
|
unknown,
|
||||||
}> {
|
{
|
||||||
|
showMultipleSelectedNotes: boolean;
|
||||||
public editors: Editor[] = []
|
}
|
||||||
|
> {
|
||||||
|
public controllers: NoteController[] = [];
|
||||||
|
|
||||||
/* @ngInject */
|
/* @ngInject */
|
||||||
constructor($timeout: ng.ITimeoutService,) {
|
constructor($timeout: ng.ITimeoutService) {
|
||||||
super($timeout);
|
super($timeout);
|
||||||
this.state = {
|
this.state = {
|
||||||
showMultipleSelectedNotes: false
|
showMultipleSelectedNotes: false,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
$onInit() {
|
$onInit() {
|
||||||
this.application.editorGroup.addChangeObserver(() => {
|
this.application.noteControllerGroup.addChangeObserver(() => {
|
||||||
this.editors = this.application.editorGroup.editors;
|
this.controllers = this.application.noteControllerGroup.noteControllers;
|
||||||
});
|
});
|
||||||
this.autorun(() => {
|
this.autorun(() => {
|
||||||
this.setState({
|
this.setState({
|
||||||
showMultipleSelectedNotes: this.appState.notes.selectedNotesCount > 1
|
showMultipleSelectedNotes: this.appState.notes.selectedNotesCount > 1,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -37,7 +39,7 @@ export class EditorGroupView extends WebDirective {
|
|||||||
this.controllerAs = 'self';
|
this.controllerAs = 'self';
|
||||||
this.bindToController = true;
|
this.bindToController = true;
|
||||||
this.scope = {
|
this.scope = {
|
||||||
application: '='
|
application: '=',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user