Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-15 09:45:52 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/master' into m42

Browse Source 
# Conflicts:
#	src/public/app/services/app_context.js
This commit is contained in:
zadam
2020-04-25 23:53:19 +02:00
parent 75c58cbf79 d1eacbb574
commit aff12950f0
10 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/public/app/widgets/basic_widget.js
View File

@@ -57,7 +57,10 @@ class BasicWidget extends Component {
for (const key in this.attrs) {
if (key === 'style') {
if (this.attrs[key]) {
$widget.attr(key, $widget.attr('style') + ';' + this.attrs[key]);
let style = $widget.attr('style');
style = style ? `${style}; ${this.attrs[key]}` : this.attrs[key];
$widget.attr(key, style);
}
}
else {

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

@@ -61,6 +61,8 @@ export default class NoteDetailWidget extends TabAwareWidget {
const dto = note.dto;
dto.content = this.getTypeWidget().getContent();
protectedSessionHolder.touchProtectedSessionIfNecessary(note);
await server.put('notes/' + noteId, dto, this.componentId);
});
}

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

@@ -29,6 +29,8 @@ export default class NoteTitleWidget extends TabAwareWidget {
this.spacedUpdate = new SpacedUpdate(async () => {
const title = this.$noteTitle.val();
protectedSessionHolder.touchProtectedSessionIfNecessary(this.note);
await server.put(`notes/${this.noteId}/change-title`, {title});
});
}

4
src/public/app/widgets/protected_note_switch.js
View File

@@ -5,12 +5,12 @@ const TPL = `
<div class="btn-group btn-group-xs">
<button type="button"
class="btn btn-sm icon-button bx bx-check-shield protect-button"
title="Protected note can be viewed and edited only after entering password">
title="Set this note as protected which means it will possible to view and edit this note only after entering password">
</button>
<button type="button"
class="btn btn-sm icon-button bx bx-shield-x unprotect-button"
title="Not protected note can be viewed without entering password">
title="Set this note as unprotected which will make it viewable and editable without entering password">
</button>
</div>`;``;