From 0630957ef092ef2c4a3411b456e722ffa9d8fad9 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Thu, 8 Oct 2020 09:20:51 -0500 Subject: [PATCH] fix: template notes and editors --- app/assets/javascripts/utils.ts | 15 +-------------- .../javascripts/views/editor/editor_view.ts | 4 ++++ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/utils.ts b/app/assets/javascripts/utils.ts index dfc719a46..5ce4710cb 100644 --- a/app/assets/javascripts/utils.ts +++ b/app/assets/javascripts/utils.ts @@ -1,18 +1,5 @@ export const isDev = process.env.NODE_ENV === 'development'; -export function getParameterByName(name: string, url: string) { - name = name.replace(/[[\]]/g, '\\$&'); - var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'); - var results = regex.exec(url); - if (!results) return null; - if (!results[2]) return ''; - return decodeURIComponent(results[2].replace(/\+/g, ' ')); -} - -export function isNullOrUndefined(value: any) { - return value === null || value === undefined; -} - export function getPlatformString() { try { const platform = navigator.platform.toLowerCase(); @@ -78,7 +65,7 @@ export function debounce(this: any, func: any, wait: number, immediate = false) if (!Array.prototype.includes) { // eslint-disable-next-line no-extend-native Object.defineProperty(Array.prototype, 'includes', { - value: function(searchElement: any, fromIndex: number) { + value: function (searchElement: any, fromIndex: number) { if (this == null) { throw new TypeError('"this" is null or not defined'); } diff --git a/app/assets/javascripts/views/editor/editor_view.ts b/app/assets/javascripts/views/editor/editor_view.ts index 7cabd1323..8b2166352 100644 --- a/app/assets/javascripts/views/editor/editor_view.ts +++ b/app/assets/javascripts/views/editor/editor_view.ts @@ -347,6 +347,10 @@ class EditorViewCtrl extends PureViewCtrl<{}, EditorState> { private async reloadEditor() { const newEditor = this.application.componentManager!.editorForNote(this.note); + /** Editors cannot interact with template notes so the note must be inserted */ + if (newEditor && this.editor.isTemplateNote) { + await this.editor.insertTemplatedNote(); + } const currentEditor = this.state.editorComponent; if (currentEditor?.uuid !== newEditor?.uuid) { await this.setState({