gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename note_attributes widget to attribute_list

Browse Source
This commit is contained in:
zadam 2020-07-16 23:12:10 +02:00
parent 0ab9d02434
commit 68d8b1c8a9
5 changed files with 50 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
package-lock.json generated
View File

@ -1148,6 +1148,14 @@
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
}, },
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"requires": {
"color-convert": "^1.9.0"
}
},
"any-base": { "any-base": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz", "resolved": "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz",
@ -1935,6 +1943,31 @@
"lodash": "^4.17.14" "lodash": "^4.17.14"
} }
}, },
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
},
"dependencies": {
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"requires": {
"has-flag": "^3.0.0"
}
}
}
},
"cheerio": { "cheerio": {
"version": "1.0.0-rc.2", "version": "1.0.0-rc.2",
"resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz",
@ -6271,34 +6304,6 @@
"supports-color": "^6.1.0" "supports-color": "^6.1.0"
}, },
"dependencies": { "dependencies": {
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"requires": {
"color-convert": "^1.9.0"
}
},
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
},
"dependencies": {
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"requires": {
"has-flag": "^3.0.0"
}
}
}
},
"has-flag": { "has-flag": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@ -6783,36 +6788,16 @@
} }
}, },
"sanitize-html": { "sanitize-html": {
"version": "1.27.0", "version": "1.27.1",
"resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.0.tgz", "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.27.1.tgz",
"integrity": "sha512-U1btucGeYVpg0GoK43jPpe/bDCV4cBOGuxzv5NBd0bOjyZdMKY0n98S/vNlO1wVwre0VCj8H3hbzE7gD2+RjKA==", "integrity": "sha512-C+N7E+7ikYaLHdb9lEkQaFOgmj+9ddZ311Ixs/QsBsoLD411/vdLweiFyGqrswUVgLqagOS5NCDxcEPH7trObQ==",
"requires": { "requires": {
"chalk": "^2.4.1",
"htmlparser2": "^4.1.0", "htmlparser2": "^4.1.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"postcss": "^7.0.27", "postcss": "^7.0.27",
"srcset": "^2.0.1", "srcset": "^2.0.1"
"xtend": "^4.0.1"
}, },
"dependencies": { "dependencies": {
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"requires": {
"color-convert": "^1.9.0"
}
},
"chalk": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
"requires": {
"ansi-styles": "^3.2.1",
"escape-string-regexp": "^1.0.5",
"supports-color": "^5.3.0"
}
},
"dom-serializer": { "dom-serializer": {
"version": "0.2.2", "version": "0.2.2",
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
@ -6850,11 +6835,6 @@
"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==" "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="
}, },
"has-flag": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
},
"htmlparser2": { "htmlparser2": {
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
@ -6865,14 +6845,6 @@
"domutils": "^2.0.0", "domutils": "^2.0.0",
"entities": "^2.0.0" "entities": "^2.0.0"
} }
},
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
"requires": {
"has-flag": "^3.0.0"
}
} }
} }
}, },

2
package.json
View File

@ -60,7 +60,7 @@
"rcedit": "2.2.0", "rcedit": "2.2.0",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"sanitize-html": "^1.27.0", "sanitize-html": "^1.27.1",
"sax": "1.2.4", "sax": "1.2.4",
"semver": "7.3.2", "semver": "7.3.2",
"serve-favicon": "2.5.0", "serve-favicon": "2.5.0",

4
src/public/app/layouts/desktop_main_window_layout.js
View File

@ -11,7 +11,7 @@ import NoteTreeWidget from "../widgets/note_tree.js";
import TabCachingWidget from "../widgets/tab_caching_widget.js"; import TabCachingWidget from "../widgets/tab_caching_widget.js";
import NotePathsWidget from "../widgets/note_paths.js"; import NotePathsWidget from "../widgets/note_paths.js";
import NoteTitleWidget from "../widgets/note_title.js"; import NoteTitleWidget from "../widgets/note_title.js";
import NoteAttributesWidget from "../widgets/note_attributes.js"; import AttributeListWidget from "../widgets/attribute_list.js";
import RunScriptButtonsWidget from "../widgets/run_script_buttons.js"; import RunScriptButtonsWidget from "../widgets/run_script_buttons.js";
import NoteTypeWidget from "../widgets/note_type.js"; import NoteTypeWidget from "../widgets/note_type.js";
import NoteActionsWidget from "../widgets/note_actions.js"; import NoteActionsWidget from "../widgets/note_actions.js";
@ -135,7 +135,7 @@ export default class DesktopMainWindowLayout {
.child(new NoteTypeWidget().hideInZenMode()) .child(new NoteTypeWidget().hideInZenMode())
.child(new NoteActionsWidget().hideInZenMode()) .child(new NoteActionsWidget().hideInZenMode())
) )
.child(new TabCachingWidget(() => new NoteAttributesWidget())) .child(new TabCachingWidget(() => new AttributeListWidget()))
.child(new TabCachingWidget(() => new PromotedAttributesWidget())) .child(new TabCachingWidget(() => new PromotedAttributesWidget()))
.child(new TabCachingWidget(() => new NoteDetailWidget())) .child(new TabCachingWidget(() => new NoteDetailWidget()))
.child(...this.customWidgets.get('center-pane')) .child(...this.customWidgets.get('center-pane'))

20
src/public/app/widgets/note_attributes.js → src/public/app/widgets/attribute_list.js
View File

@ -125,14 +125,14 @@ const editorConfig = {
}; };
const TPL = ` const TPL = `
<div class="note-attributes"> <div class="attribute-list">
<style> <style>
.note-attributes { .attribute-list {
margin-left: 7px; margin-left: 7px;
margin-right: 7px; margin-right: 7px;
} }
.note-attributes-editor { .attribute-list-editor {
border: 0 !important; border: 0 !important;
outline: 0 !important; outline: 0 !important;
box-shadow: none !important; box-shadow: none !important;
@ -151,11 +151,11 @@ const TPL = `
padding-left: 7px; padding-left: 7px;
} }
.note-attributes-editor p { .attribute-list-editor p {
margin: 0 !important; margin: 0 !important;
} }
.note-attributes.error .note-attributes-editor { .attribute-list.error .attribute-list-editor {
border-color: red !important; border-color: red !important;
} }
@ -166,7 +166,7 @@ const TPL = `
font-size: small; font-size: small;
} }
.note-attributes hr { .attribute-list hr {
height: 1px; height: 1px;
border-color: var(--main-border-color); border-color: var(--main-border-color);
position: relative; position: relative;
@ -237,7 +237,7 @@ const TPL = `
<div class="attr-display"> <div class="attr-display">
<div style="position: relative"> <div style="position: relative">
<div class="note-attributes-editor" tabindex="200"></div> <div class="attribute-list-editor" tabindex="200"></div>
<div class="bx bx-save save-attributes-button" title="Save attributes <enter>, <tab>)"></div> <div class="bx bx-save save-attributes-button" title="Save attributes <enter>, <tab>)"></div>
@ -249,7 +249,7 @@ const TPL = `
<div class="attr-expander attr-inherited-expander"> <div class="attr-expander attr-inherited-expander">
<hr class="w-100"> <hr class="w-100">
<div class="attr-expander-text">5 inherited attributes</div> <div class="attr-expander-text"></div>
<hr class="w-100"> <hr class="w-100">
</div> </div>
@ -260,7 +260,7 @@ const TPL = `
</div> </div>
`; `;
export default class NoteAttributesWidget extends TabAwareWidget { export default class AttributeListWidget extends TabAwareWidget {
constructor() { constructor() {
super(); super();
@ -275,7 +275,7 @@ export default class NoteAttributesWidget extends TabAwareWidget {
doRender() { doRender() {
this.$widget = $(TPL); this.$widget = $(TPL);
this.$editor = this.$widget.find('.note-attributes-editor'); this.$editor = this.$widget.find('.attribute-list-editor');
this.initialized = this.initEditor(); this.initialized = this.initEditor();

1
src/public/stylesheets/style.css
View File

@ -246,7 +246,6 @@ div.ui-tooltip {
} }
.CodeMirror { .CodeMirror {
font-family: "Liberation Mono", "Lucida Console", monospace;
height: 100%; height: 100%;
background: inherit; background: inherit;
} }