diff --git a/package-lock.json b/package-lock.json index 773f891c8..1c3ad3f51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4549,9 +4549,9 @@ } }, "jasmine": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.2.tgz", - "integrity": "sha512-Uc0o2MRnC8TS1MjDrB8jE1umKEo2mflzGvdg0Ncs+yuLtOJ+uz/Wz8VmGsNGtuASr8+E0LDgPkOpvdoC76m5WQ==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.3.tgz", + "integrity": "sha512-Th91zHsbsALWjDUIiU5d/W5zaYQsZFMPTdeNmi8GivZPmAaUAK8MblSG3yQI4VMGC/abF2us7ex60NH1AAIMTA==", "dev": true, "requires": { "glob": "^7.1.6", diff --git a/package.json b/package.json index 68661cff5..c348cce70 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "electron-packager": "15.1.0", "electron-rebuild": "2.3.2", "esm": "3.2.25", - "jasmine": "3.6.2", + "jasmine": "3.6.3", "jsdoc": "3.6.6", "lorem-ipsum": "2.0.3", "rcedit": "2.2.0", diff --git a/src/public/app/layouts/desktop_extra_window_layout.js b/src/public/app/layouts/desktop_extra_window_layout.js index b362de5d1..b14cd7d1e 100644 --- a/src/public/app/layouts/desktop_extra_window_layout.js +++ b/src/public/app/layouts/desktop_extra_window_layout.js @@ -9,7 +9,7 @@ import RunScriptButtonsWidget from "../widgets/run_script_buttons.js"; import NoteTypeWidget from "../widgets/note_type.js"; import NoteActionsWidget from "../widgets/note_actions.js"; import NoteDetailWidget from "../widgets/note_detail.js"; -import AttributeListWidget from "../widgets/attribute_list.js"; +import OwnedAttributeListWidget from "../widgets/owned_attribute_list.js"; export default class DesktopExtraWindowLayout { constructor(customWidgets) { @@ -39,7 +39,7 @@ export default class DesktopExtraWindowLayout { .child(new NoteTypeWidget().hideInZenMode()) .child(new NoteActionsWidget().hideInZenMode()) ) - .child(new TabCachingWidget(() => new AttributeListWidget())) + .child(new TabCachingWidget(() => new OwnedAttributeListWidget())) .child(new TabCachingWidget(() => new NoteDetailWidget())) .child(...this.customWidgets.get('center-pane')) ) diff --git a/src/public/app/layouts/desktop_main_window_layout.js b/src/public/app/layouts/desktop_main_window_layout.js index a5e8e7c46..f7381ea96 100644 --- a/src/public/app/layouts/desktop_main_window_layout.js +++ b/src/public/app/layouts/desktop_main_window_layout.js @@ -11,7 +11,7 @@ import NoteTreeWidget from "../widgets/note_tree.js"; import TabCachingWidget from "../widgets/tab_caching_widget.js"; import NotePathsWidget from "../widgets/note_paths.js"; import NoteTitleWidget from "../widgets/note_title.js"; -import AttributeListWidget from "../widgets/attribute_list.js"; +import OwnedAttributeListWidget from "../widgets/owned_attribute_list.js"; import RunScriptButtonsWidget from "../widgets/run_script_buttons.js"; import NoteTypeWidget from "../widgets/note_type.js"; import NoteActionsWidget from "../widgets/note_actions.js"; @@ -26,6 +26,7 @@ import SidePaneToggles from "../widgets/side_pane_toggles.js"; import EditedNotesWidget from "../widgets/collapsible_widgets/edited_notes.js"; import CollapsibleSectionContainer from "../widgets/collapsible_section_container.js"; import PromotedAttributesWidget from "../widgets/promoted_attributes.js"; +import InheritedAttributesWidget from "../widgets/inherited_attribute_list.js"; const RIGHT_PANE_CSS = ` - -
- -