Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

closing of attr detail

Browse Source
This commit is contained in:
zadam
2020-07-03 22:27:45 +02:00
parent 5b862c3d29
commit bfa69a3dc3
36 changed files with 95 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
package-lock.json generated
View File

@@ -1058,14 +1058,6 @@
"requires": {
"clean-stack": "^2.0.0",
"indent-string": "^4.0.0"
},
"dependencies": {
"indent-string": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
"dev": true
}
}
},
"ajv": {
@@ -1877,20 +1869,6 @@
"minipass": "^3.0.0"
}
},
"glob": {
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"minipass": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
@@ -2249,6 +2227,12 @@
}
}
},
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
},
"commondir": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -2588,9 +2572,9 @@
}
},
"dayjs": {
"version": "1.8.28",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.28.tgz",
"integrity": "sha512-ccnYgKC0/hPSGXxj7Ju6AV/BP4HUkXC2u15mikXT5mX9YorEaoi1bEKOmAqdkJHN4EEkmAf97SpH66Try5Mbeg=="
"version": "1.8.29",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.29.tgz",
"integrity": "sha512-Vm6teig8ZWK7rH/lxzVGxZJCljPdmUr6q/3f4fr5F0VWNGVkZEjZOQJsAN8hUHUqn+NK4XHNEpJZS1MwLyDcLw=="
},
"debug": {
"version": "4.1.1",
@@ -2857,9 +2841,9 @@
}
},
"electron": {
"version": "10.0.0-beta.4",
"resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0-beta.4.tgz",
"integrity": "sha512-/Jp9i0yiuM/WUdiKFjf7+5gZQJITGhijl++Zp31m94MY+QNMLEnFhaKLSqzrmPA2FPrXn2KlUPNpQs+4Wjcvpg==",
"version": "10.0.0-beta.8",
"resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0-beta.8.tgz",
"integrity": "sha512-LTGVPTwBZkKNMNO8RP6ibBdAOyfnc8MFOS8ULYIavsPWMVDR4FwJJoq08++MnbYxV79/6P5SvPy1BCnSpetmTQ==",
"dev": true,
"requires": {
"@electron/get": "^1.0.1",
@@ -4221,6 +4205,20 @@
"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
},
"glob": {
"version": "7.1.6",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "^3.0.4",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"glob-to-regexp": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
@@ -4557,6 +4555,12 @@
"resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
"integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
},
"indent-string": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
"dev": true
},
"infer-owner": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
@@ -4801,30 +4805,13 @@
"dev": true
},
"jest-worker": {
"version": "26.0.0",
"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
"integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
"version": "26.1.0",
"resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz",
"integrity": "sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ==",
"dev": true,
"requires": {
"merge-stream": "^2.0.0",
"supports-color": "^7.0.0"
},
"dependencies": {
"merge-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
"dev": true
},
"supports-color": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"jimp": {
@@ -5388,6 +5375,12 @@
"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
"integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
},
"merge-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
"integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
"dev": true
},
"methods": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -7392,6 +7385,15 @@
"peek-readable": "^3.1.0"
}
},
"supports-color": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
"dev": true,
"requires": {
"has-flag": "^4.0.0"
}
},
"symbol-tree": {
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -7531,20 +7533,12 @@
"commander": "^2.20.0",
"source-map": "~0.6.1",
"source-map-support": "~0.5.12"
},
"dependencies": {
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
}
}
},
"terser-webpack-plugin": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.5.tgz",
"integrity": "sha512-pyHUyfQUZB3ciYL81GgXzDh8Qb3fGED77xDjZVSFYSN1cQnWgC51OMPKj7vBWVZx0GGuYhpa9+Vz2KxkzXWhBA==",
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.6.tgz",
"integrity": "sha512-z3HLOOPUHkCNGkeEHqqiMAIy1pjpHwS1o+i6Zn0Ws3EAvHJj46737efNNEvJ0Vx9BdDQM83d56qySDJOSORA0A==",
"dev": true,
"requires": {
"cacache": "^15.0.4",
@@ -7554,7 +7548,7 @@
"schema-utils": "^2.6.6",
"serialize-javascript": "^4.0.0",
"source-map": "^0.6.1",
"terser": "^4.6.13",
"terser": "^4.8.0",
"webpack-sources": "^1.4.3"
},
"dependencies": {
@@ -8033,9 +8027,9 @@
"integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="
},
"webpack": {
"version": "5.0.0-beta.18",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.0.0-beta.18.tgz",
"integrity": "sha512-v+kyUEA1sQnSP6gcchyEY/Jufb1XEbniCmA7uXvWXWFPQnN51ChW8liF0FgUre8yYI5jRqVsNHFw3H9rGCB8qw==",
"version": "5.0.0-beta.20",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.0.0-beta.20.tgz",
"integrity": "sha512-bIUAephArRkyWBzhLJ7OD5ys+jTNgANuJJy4+qhAWd5De4T0l/qKrVYdXZCbAj3PXUdxyEL5KsJHPQHacyfBGQ==",
"dev": true,
"requires": {
"@types/estree": "0.0.42",

4
package.json
View File

@@ -76,7 +76,7 @@
},
"devDependencies": {
"cross-env": "^7.0.2",
"electron": "10.0.0-beta.4",
"electron": "10.0.0-beta.8",
"electron-builder": "22.7.0",
"electron-packager": "15.0.0",
"electron-rebuild": "1.11.0",
@@ -84,7 +84,7 @@
"jasmine": "^3.5.0",
"jsdoc": "3.6.4",
"lorem-ipsum": "2.0.3",
"webpack": "5.0.0-beta.18",
"webpack": "5.0.0-beta.20",
"webpack-cli": "4.0.0-beta.8"
},
"optionalDependencies": {

22
src/public/app/widgets/attribute_detail.js
View File

@@ -37,10 +37,19 @@ const TPL = `
.attr-edit td input {
width: 100%;
}
.close-attr-detail-button {
font-size: x-large;
cursor: pointer;
}
</style>
<div style="display: flex; justify-content: space-between;">
<h5>Label detail</h5>
<span class="bx bx-x close-attr-detail-button"></span>
</div>
<table class="attr-edit">
<tr>
<th>Name:</th>
@@ -91,8 +100,17 @@ export default class AttributeDetailWidget extends BasicWidget {
this.$attrEditName = this.$widget.find('.attr-edit-name');
this.$attrEditValue = this.$widget.find('.attr-edit-value');
this.$attrEditInheritable = this.$widget.find('.attr-edit-inheritable');
this.$closeAttrDetailButton = this.$widget.find('.close-attr-detail-button');
return this.$widget;
this.$closeAttrDetailButton.on('click', () => this.hide());
$(window).on('mouseup', e => {
console.log("click", e.target);
if (!$(e.target).closest(this.$widget[0]).length) {
this.hide();
}
});
}
async showAttributeDetail(attr, x, y) {
@@ -140,7 +158,7 @@ export default class AttributeDetailWidget extends BasicWidget {
this.$relatedNotesMoreNotes.hide();
}
this.$attrEditName.val(attr.name);
this.$attrEditName.val(attr.name).focus();
this.$attrEditValue.val(attr.value);
this.$widget.css("left", x - this.$widget.width() / 2);

2
src/public/app/widgets/collapsible_widget.js
View File

@@ -70,8 +70,6 @@ export default class CollapsibleWidget extends TabAwareWidget {
this.initialized = this.doRenderBody();
this.decorateWidget();
return this.$widget;
}
saveCollapsed(collapse) {

2
src/public/app/widgets/flex_container.js
View File

@@ -40,7 +40,5 @@ export default class FlexContainer extends BasicWidget {
for (const widget of this.children) {
this.$widget.append(widget.render());
}
return this.$widget;
}
}

2
src/public/app/widgets/global_menu.js
View File

@@ -113,7 +113,5 @@ export default class GlobalMenuWidget extends BasicWidget {
this.$widget.find(".logout-button").toggle(!utils.isElectron());
this.$widget.find(".open-dev-tools-button").toggle(utils.isElectron());
return this.$widget;
}
}

2
src/public/app/widgets/history_navigation.js
View File

@@ -51,8 +51,6 @@ export default class HistoryNavigationWidget extends BasicWidget {
else {
this.$widget = $("<div>");
}
return this.$widget;
}
async showContextMenu(e) {

2
src/public/app/widgets/mobile_widgets/close_detail_button.js
View File

@@ -10,8 +10,6 @@ class CloseDetailButtonWidget extends BasicWidget {
this.$widget = $(TPL);
this.$widget.on('click', () => this.triggerCommand('setActiveScreen', {screen:'tree'}));
return this.$widget;
}
}

2
src/public/app/widgets/mobile_widgets/mobile_detail_menu.js
View File

@@ -38,8 +38,6 @@ class MobileDetailMenuWidget extends BasicWidget {
}
});
});
return this.$widget;
}
}

2
src/public/app/widgets/note_actions.js
View File

@@ -113,8 +113,6 @@ export default class NoteActionsWidget extends TabAwareWidget {
this.$unprotectButton = this.$widget.find(".unprotect-button");
this.$unprotectButton.on('click', () => protectedSessionService.protectNote(this.noteId, false, false));
return this.$widget;
}
refreshWithNote(note) {

6
src/public/app/widgets/note_attributes.js
View File

@@ -234,12 +234,6 @@ export default class NoteAttributesWidget extends TabAwareWidget {
this.attributeDetailWidget.hide();
});
this.$editor.on('blur', () => {
this.save();
this.attributeDetailWidget.hide();
});
this.$widget.append(this.attributeDetailWidget.render());
}

2
src/public/app/widgets/note_detail.js
View File

@@ -100,8 +100,6 @@ export default class NoteDetailWidget extends TabAwareWidget {
replaceUnderscoresWithSpaces: true
});
});
return this.$widget;
}
async refresh() {

2
src/public/app/widgets/note_paths.js
View File

@@ -57,8 +57,6 @@ export default class NotePathsWidget extends TabAwareWidget {
this.$notePathList = this.$dropdown.find(".note-path-list");
this.$dropdown.on('show.bs.dropdown', () => this.renderDropdown());
return this.$widget;
}
async refreshWithNote(note, notePath) {

2
src/public/app/widgets/note_title.js
View File

@@ -48,8 +48,6 @@ export default class NoteTitleWidget extends TabAwareWidget {
utils.bindElShortcut(this.$noteTitle, 'return', () => {
this.triggerCommand('focusOnAttributes', {tabId: this.tabContext.tabId});
});
return this.$widget;
}
async refreshWithNote(note) {

2
src/public/app/widgets/note_tree.js
View File

@@ -250,8 +250,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
this.initialized = this.initFancyTree();
this.setupNoteTitleTooltip();
return this.$widget;
}
setupNoteTitleTooltip() {

2
src/public/app/widgets/note_type.js
View File

@@ -40,8 +40,6 @@ export default class NoteTypeWidget extends TabAwareWidget {
this.$noteTypeDropdown = this.$widget.find(".note-type-dropdown");
this.$noteTypeButton = this.$widget.find(".note-type-button");
this.$noteTypeDesc = this.$widget.find(".note-type-desc");
return this.$widget;
}
async refreshWithNote(note) {

2
src/public/app/widgets/promoted_attributes.js
View File

@@ -32,8 +32,6 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
this.$widget = $(TPL);
this.$container = this.$widget.find(".promoted-attributes");
return this.$widget;
}
async refreshWithNote(note) {

2
src/public/app/widgets/run_script_buttons.js
View File

@@ -17,8 +17,6 @@ export default class RunScriptButtonsWidget extends TabAwareWidget {
this.$renderButton = this.$widget.find('.render-button');
this.$executeScriptButton = this.$widget.find('.execute-script-button');
return this.$widget;
}
refreshWithNote(note) {

2
src/public/app/widgets/search_box.js
View File

@@ -71,8 +71,6 @@ export default class SearchBoxWidget extends BasicWidget {
this.$saveSearchButton.on('click', () => this.saveSearch());
this.$closeSearchButton.on('click', () => this.hideSearch());
return this.$widget;
}
doSearch(searchText) {

2
src/public/app/widgets/search_results.js
View File

@@ -35,8 +35,6 @@ export default class SearchResultsWidget extends BasicWidget {
this.$searchResultsInner = this.$widget.find(".search-results-list");
this.toggleInt(false);
return this.$widget;
}
searchResultsEvent({results}) {

2
src/public/app/widgets/side_pane_toggles.js
View File

@@ -43,8 +43,6 @@ export default class SidePaneToggles extends BasicWidget {
this.$widget.find(".show-left-pane-button").on('click', () => this.toggleAndSave('left', true));
this.$widget.find(".hide-left-pane-button").on('click', () => this.toggleAndSave('left', false));
return this.$widget;
}
toggleSidebar(side, show) {

2
src/public/app/widgets/tab_row.js
View File

@@ -267,8 +267,6 @@ export default class TabRowWidget extends BasicWidget {
}
});
});
return this.$widget;
}
setupStyle() {

2
src/public/app/widgets/title_bar_buttons.js
View File

@@ -63,7 +63,5 @@ export default class TitleBarButtonsWidget extends BasicWidget {
const {remote} = utils.dynamicRequire('electron');
remote.BrowserWindow.getFocusedWindow().close();
});
return this.$widget;
}
}

2
src/public/app/widgets/type_widgets/book.js
View File

@@ -170,8 +170,6 @@ export default class BookTypeWidget extends TypeWidget {
$card.find('.note-book-children-content').empty();
});
return this.$widget;
}
async expandCard($card) {

2
src/public/app/widgets/type_widgets/deleted.js
View File

@@ -14,7 +14,5 @@ export default class DeletedTypeWidget extends TypeWidget {
doRender() {
this.$widget = $(TPL);
return this.$widget;
}
}

2
src/public/app/widgets/type_widgets/editable_code.js
View File

@@ -82,8 +82,6 @@ export default class EditableCodeTypeWidget extends TypeWidget {
this.$sqlConsoleExecuteButton.on('click', () => this.execute());
this.initialized = this.initEditor();
return this.$widget;
}
async initEditor() {

2
src/public/app/widgets/type_widgets/editable_text.js
View File

@@ -88,8 +88,6 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
keyboardActionService.setupActionsForElement('text-detail', this.$widget, this);
super.doRender();
return this.$widget;
}
async initEditor() {

2
src/public/app/widgets/type_widgets/empty.js
View File

@@ -31,8 +31,6 @@ export default class EmptyTypeWidget extends TypeWidget {
});
noteAutocompleteService.showRecentNotes(this.$autoComplete);
return this.$widget;
}
doRefresh(note) {

2
src/public/app/widgets/type_widgets/file.js
View File

@@ -116,8 +116,6 @@ export default class FileTypeWidget extends TypeWidget {
toastService.showError("Upload of a new file revision failed.");
}
});
return this.$widget;
}
async doRefresh(note) {

2
src/public/app/widgets/type_widgets/image.js
View File

@@ -119,8 +119,6 @@ class ImageTypeWidget extends TypeWidget {
toastService.showError("Upload of a new image revision failed: " + result.message);
}
});
return this.$widget;
}
async doRefresh(note) {

2
src/public/app/widgets/type_widgets/protected_session.js
View File

@@ -36,7 +36,5 @@ export default class ProtectedSessionTypeWidget extends TypeWidget {
return false;
});
return this.$widget;
}
}

2
src/public/app/widgets/type_widgets/read_only_code.js
View File

@@ -32,8 +32,6 @@ export default class ReadOnlyCodeTypeWidget extends TypeWidget {
this.triggerEvent('codePreviewDisabled', {tabContext: this.tabContext});
});
return this.$widget;
}
async doRefresh(note) {

2
src/public/app/widgets/type_widgets/read_only_text.js
View File

@@ -52,8 +52,6 @@ export default class ReadOnlyTextTypeWidget extends AbstractTextTypeWidget {
});
super.doRender();
return this.$widget;
}
cleanup() {

2
src/public/app/widgets/type_widgets/relation_map.js
View File

@@ -182,8 +182,6 @@ export default class RelationMapTypeWidget extends TypeWidget {
jsPlumb.ready(res);
});
return this.$widget;
}
async contextMenuHandler(command, originalTarget) {

2
src/public/app/widgets/type_widgets/render.js
View File

@@ -25,8 +25,6 @@ export default class RenderTypeWidget extends TypeWidget {
this.$widget = $(TPL);
this.$noteDetailRenderHelp = this.$widget.find('.note-detail-render-help');
this.$noteDetailRenderContent = this.$widget.find('.note-detail-render-content');
return this.$widget;
}
async doRefresh(note) {

2
src/public/app/widgets/type_widgets/search.js
View File

@@ -20,8 +20,6 @@ export default class SearchTypeWidget extends TypeWidget {
this.$searchString = this.$widget.find(".search-string");
this.$component = this.$widget.find('.note-detail-search');
this.$help = this.$widget.find(".note-detail-search-help");
return this.$widget;
}
async doRefresh(note) {