diff --git a/src/public/app/dialogs/note_info.js b/src/public/app/dialogs/note_info.js deleted file mode 100644 index 9d6da1139..000000000 --- a/src/public/app/dialogs/note_info.js +++ /dev/null @@ -1,26 +0,0 @@ -import utils from "../services/utils.js"; -import appContext from "../services/app_context.js"; - -const $dialog = $("#note-info-dialog"); -const $noteId = $("#note-info-note-id"); -const $dateCreated = $("#note-info-date-created"); -const $dateModified = $("#note-info-date-modified"); -const $type = $("#note-info-type"); -const $mime = $("#note-info-mime"); -const $okButton = $("#note-info-ok-button"); - -export async function showDialog() { - utils.openDialog($dialog); - - const activeNoteContext = appContext.tabManager.getActiveContext(); - const {note} = activeNoteContext; - const noteComplement = await activeNoteContext.getNoteComplement(); - - $noteId.text(note.noteId); - $dateCreated.text(noteComplement.dateCreated); - $dateModified.text(noteComplement.dateModified); - $type.text(note.type); - $mime.text(note.mime); -} - -$okButton.on('click', () => $dialog.modal('hide')); diff --git a/src/public/app/layouts/desktop_layout.js b/src/public/app/layouts/desktop_layout.js index 981ed8d22..2314a5686 100644 --- a/src/public/app/layouts/desktop_layout.js +++ b/src/public/app/layouts/desktop_layout.js @@ -33,6 +33,7 @@ import SidebarToggleWidget from "../widgets/buttons/sidebar_toggle.js"; import CreatePaneButton from "../widgets/buttons/create_pane_button.js"; import ClosePaneButton from "../widgets/buttons/close_pane_button.js"; import BasicPropertiesWidget from "../widgets/type_property_widgets/basic_properties.js"; +import NoteInfoWidget from "../widgets/type_property_widgets/note_info_widget.js"; export default class DesktopLayout { constructor(customWidgets) { @@ -107,6 +108,7 @@ export default class DesktopLayout { .section(new PromotedAttributesWidget()) .section(new OwnedAttributeListWidget()) .section(new InheritedAttributesWidget()) + .section(new NoteInfoWidget()) .button(new NoteActionsWidget()) ) .child(new NoteUpdateStatusWidget()) diff --git a/src/public/app/services/root_command_executor.js b/src/public/app/services/root_command_executor.js index ee6f1d6dd..4097adfb3 100644 --- a/src/public/app/services/root_command_executor.js +++ b/src/public/app/services/root_command_executor.js @@ -14,10 +14,6 @@ export default class RootCommandExecutor extends Component { import("../dialogs/recent_changes.js").then(d => d.showDialog()); } - showNoteInfoCommand() { - import("../dialogs/note_info.js").then(d => d.showDialog()); - } - showNoteRevisionsCommand() { import("../dialogs/note_revisions.js").then(d => d.showCurrentNoteRevisions()); } diff --git a/src/public/app/widgets/collapsible_widgets/note_info.js b/src/public/app/widgets/type_property_widgets/note_info_widget.js similarity index 53% rename from src/public/app/widgets/collapsible_widgets/note_info.js rename to src/public/app/widgets/type_property_widgets/note_info_widget.js index e2f0bce1f..946002674 100644 --- a/src/public/app/widgets/collapsible_widgets/note_info.js +++ b/src/public/app/widgets/type_property_widgets/note_info_widget.js @@ -1,9 +1,13 @@ -import CollapsibleWidget from "../collapsible_widget.js"; +import NoteContextAwareWidget from "../note_context_aware_widget.js"; import server from "../../services/server.js"; const TPL = ` - +
-
- - - - - - - - - - - - - - - + + + + + +
Note ID:Type: - - - -
Created:Modified:
Note size: - - - - + + + + + + + + + + + + - -
Note ID:Created:Modified:
Type: + - - -
-`; + + 		Note size: + + + + + + + +
+ +`; +export default class NoteInfoWidget extends NoteContextAwareWidget { + static getType() { return "note-info"; } -export default class NoteInfoWidget extends CollapsibleWidget { isEnabled() { - return super.isEnabled() && !this.note.hasLabel('noteInfoWidgetDisabled'); + return this.note; } - get widgetTitle() { return "Note info"; } + getTitle() { + return { + show: this.isEnabled(), + activate: true, + title: 'Note Info', + icon: 'bx bx-info-circle' + }; + } - async doRenderBody() { - this.$body.html(TPL); + doRender() { + this.$widget = $(TPL); + this.overflowing(); - this.$noteId = this.$body.find(".note-info-note-id"); - this.$dateCreated = this.$body.find(".note-info-date-created"); - this.$dateModified = this.$body.find(".note-info-date-modified"); - this.$type = this.$body.find(".note-info-type"); - this.$mime = this.$body.find(".note-info-mime"); + this.$noteId = this.$widget.find(".note-info-note-id"); + this.$dateCreated = this.$widget.find(".note-info-date-created"); + this.$dateModified = this.$widget.find(".note-info-date-modified"); + this.$type = this.$widget.find(".note-info-type"); + this.$mime = this.$widget.find(".note-info-mime"); - this.$noteSizesWrapper = this.$body.find('.note-sizes-wrapper'); - this.$noteSize = this.$body.find(".note-size"); - this.$subTreeSize = this.$body.find(".subtree-size"); + this.$noteSizesWrapper = this.$widget.find('.note-sizes-wrapper'); + this.$noteSize = this.$widget.find(".note-size"); + this.$subTreeSize = this.$widget.find(".subtree-size"); - this.$calculateButton = this.$body.find(".calculate-button"); + this.$calculateButton = this.$widget.find(".calculate-button"); this.$calculateButton.on('click', async () => { this.$noteSizesWrapper.show(); this.$calculateButton.hide(); diff --git a/src/services/keyboard_actions.js b/src/services/keyboard_actions.js index 5c3d46ed5..7ebeada6e 100644 --- a/src/services/keyboard_actions.js +++ b/src/services/keyboard_actions.js @@ -230,12 +230,6 @@ const DEFAULT_KEYBOARD_ACTIONS = [ { separator: "Dialogs" }, - { - actionName: "showNoteInfo", - defaultShortcuts: [], - description: "Shows Note Info dialog", - scope: "window" - }, { actionName: "showNoteSource", defaultShortcuts: [], diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs index 4647f8895..d3f43fe5e 100644 --- a/src/views/desktop.ejs +++ b/src/views/desktop.ejs @@ -33,7 +33,6 @@ <%- include('dialogs/prompt.ejs') %> <%- include('dialogs/confirm.ejs') %> <%- include('dialogs/help.ejs') %> -<%- include('dialogs/note_info.ejs') %> <%- include('dialogs/link_map.ejs') %> <%- include('dialogs/clone_to.ejs') %> <%- include('dialogs/move_to.ejs') %> diff --git a/src/views/dialogs/note_info.ejs b/src/views/dialogs/note_info.ejs deleted file mode 100644 index c39665339..000000000 --- a/src/views/dialogs/note_info.ejs +++ /dev/null @@ -1,45 +0,0 @@ - - -