sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow specifying include note widget size

pull/255/head
zadam 2020-04-11 11:49:58 +07:00
parent 6c76d862d2
commit 242f139be4
6 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

4
src/public/javascripts/dialogs/include_note.js
Unescape Escape View File

@ -25,13 +25,15 @@ async function includeNote(notePath) {
const noteId = treeService.getNoteIdFromNotePath(notePath);
const note = await treeCache.getNote(noteId);
const boxSize = $("input[name='include-note-box-size']:checked").val();
if (note.type === 'image') {
// there's no benefit to use insert note functionlity for images
// so we'll just add an IMG tag
textTypeWidget.addImage(noteId);
}
else {
textTypeWidget.addIncludeNote(noteId);
textTypeWidget.addIncludeNote(noteId, boxSize);
}
}

5
src/public/javascripts/widgets/type_widgets/editable_text.js
Unescape Escape View File

@ -237,12 +237,13 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
import("../../dialogs/include_note.js").then(d => d.showDialog(this));
}
addIncludeNote(noteId) {
addIncludeNote(noteId, boxSize) {
this.textEditor.model.change( writer => {
// Insert <includeNote>*</includeNote> at the current selection position
// in a way that will result in creating a valid model structure
this.textEditor.model.insertContent(writer.createElement('includeNote', {
noteId: noteId
noteId: noteId,
boxSize: boxSize
}));
} );
}

10
src/public/stylesheets/style.css
Unescape Escape View File

@ -864,3 +864,13 @@ body {
.hidden-int, .hidden-ext {
display: none !important;
}
.include-note.box-size-small {
max-height: 12em;
overflow: auto;
}
.include-note.box-size-medium {
max-height: 25em;
overflow: auto;
}

21
src/views/dialogs/include_note.ejs
Unescape Escape View File

@ -15,6 +15,27 @@
<input id="include-note-autocomplete" class="form-control" placeholder="search for note by its name">
</div>
</div>
Box size of the included note:
<div class="form-check">
<input class="form-check-input" type="radio" name="include-note-box-size" value="small" id="include-note-box-size-small">
<label class="form-check-label" for="include-note-box-size-small">
small (~ 10 lines)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="include-note-box-size" value="medium" id="include-note-box-size-medium" checked>
<label class="form-check-label" for="include-note-box-size-medium">
medium (~ 30 lines)
</label>
</div>
<div class="form-check">
<input class="form-check-input" type="radio" name="include-note-box-size" value="full" id="include-note-box-size-full">
<label class="form-check-label" for="include-note-box-size-full">
full (box shows complete text)
</label>
</div>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary">Include note <kbd>enter</kbd></button>