From 3ccb1c6ac1a63d7e843876ec2115a9ad1a13a05d Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 7 Apr 2020 21:04:28 +0200 Subject: [PATCH] refactoring to editable_text --- src/public/javascripts/desktop.js | 2 +- src/public/javascripts/mobile.js | 2 +- src/public/javascripts/widgets/note_detail.js | 8 ++++++-- .../widgets/type_widgets/{text.js => editable_text.js} | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) rename src/public/javascripts/widgets/type_widgets/{text.js => editable_text.js} (98%) diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js index 9f3675335..00a17b011 100644 --- a/src/public/javascripts/desktop.js +++ b/src/public/javascripts/desktop.js @@ -56,7 +56,7 @@ import SimilarNotesWidget from "./widgets/similar_notes.js"; import WhatLinksHereWidget from "./widgets/what_links_here.js"; import SidePaneToggles from "./widgets/side_pane_toggles.js"; import EmptyTypeWidget from "./widgets/type_widgets/empty.js"; -import TextTypeWidget from "./widgets/type_widgets/text.js"; +import TextTypeWidget from "./widgets/type_widgets/editable_text.js"; import CodeTypeWidget from "./widgets/type_widgets/code.js"; import FileTypeWidget from "./widgets/type_widgets/file.js"; import ImageTypeWidget from "./widgets/type_widgets/image.js"; diff --git a/src/public/javascripts/mobile.js b/src/public/javascripts/mobile.js index efa60df81..f4bb2d49d 100644 --- a/src/public/javascripts/mobile.js +++ b/src/public/javascripts/mobile.js @@ -5,7 +5,7 @@ import noteContentRenderer from "./services/note_content_renderer.js"; import appContext from "./services/app_context.js"; import FlexContainer from "./widgets/flex_container.js"; import EmptyTypeWidget from "./widgets/type_widgets/empty.js"; -import TextTypeWidget from "./widgets/type_widgets/text.js"; +import TextTypeWidget from "./widgets/type_widgets/editable_text.js"; import CodeTypeWidget from "./widgets/type_widgets/code.js"; import FileTypeWidget from "./widgets/type_widgets/file.js"; import ImageTypeWidget from "./widgets/type_widgets/image.js"; diff --git a/src/public/javascripts/widgets/note_detail.js b/src/public/javascripts/widgets/note_detail.js index c72d7f0e2..2c0c5cd55 100644 --- a/src/public/javascripts/widgets/note_detail.js +++ b/src/public/javascripts/widgets/note_detail.js @@ -5,7 +5,7 @@ import SpacedUpdate from "../services/spaced_update.js"; import server from "../services/server.js"; import libraryLoader from "../services/library_loader.js"; import EmptyTypeWidget from "./type_widgets/empty.js"; -import TextTypeWidget from "./type_widgets/text.js"; +import EditableTextTypeWidget from "./type_widgets/editable_text.js"; import CodeTypeWidget from "./type_widgets/code.js"; import FileTypeWidget from "./type_widgets/file.js"; import ImageTypeWidget from "./type_widgets/image.js"; @@ -36,7 +36,7 @@ const TPL = ` const typeWidgetClasses = { 'empty': EmptyTypeWidget, 'deleted': DeletedTypeWidget, - 'text': TextTypeWidget, + 'editable-text': EditableTextTypeWidget, 'read-only-text': ReadOnlyTextTypeWidget, 'code': CodeTypeWidget, 'file': FileTypeWidget, @@ -187,6 +187,10 @@ export default class NoteDetailWidget extends TabAwareWidget { } } + if (type === 'text') { + type = 'editable-text'; + } + if (note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable()) { type = 'protected-session'; } diff --git a/src/public/javascripts/widgets/type_widgets/text.js b/src/public/javascripts/widgets/type_widgets/editable_text.js similarity index 98% rename from src/public/javascripts/widgets/type_widgets/text.js rename to src/public/javascripts/widgets/type_widgets/editable_text.js index cd5d12111..c2d4ed643 100644 --- a/src/public/javascripts/widgets/type_widgets/text.js +++ b/src/public/javascripts/widgets/type_widgets/editable_text.js @@ -78,8 +78,8 @@ const TPL = ` `; -export default class TextTypeWidget extends TypeWidget { - static getType() { return "text"; } +export default class EditableTextTypeWidget extends TypeWidget { + static getType() { return "editable-text"; } doRender() { this.$widget = $(TPL);