gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 19:49:01 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
zadam 2019-06-30 19:58:56 +02:00
commit ef46727870
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/public/javascripts/services/note_detail_image.js
View File

@ -1,5 +1,4 @@
import utils from "./utils.js"; import utils from "./utils.js";
import noteDetailService from "./note_detail.js";
import infoService from "./info.js"; import infoService from "./info.js";
import server from "./server.js"; import server from "./server.js";

3
src/public/javascripts/services/note_detail_text.js
View File

@ -8,6 +8,7 @@ class NoteDetailText {
constructor(ctx) { constructor(ctx) {
this.ctx = ctx; this.ctx = ctx;
this.$component = ctx.$tabContent.find('.note-detail-text'); this.$component = ctx.$tabContent.find('.note-detail-text');
this.$editorEl = this.$component.find('.note-detail-text-editor');
this.textEditor = null; this.textEditor = null;
this.$component.on("dblclick", "img", e => { this.$component.on("dblclick", "img", e => {
@ -39,7 +40,7 @@ class NoteDetailText {
// textEditor might have been initialized during previous await so checking again // textEditor might have been initialized during previous await so checking again
// looks like double initialization can freeze CKEditor pretty badly // looks like double initialization can freeze CKEditor pretty badly
if (!this.textEditor) { if (!this.textEditor) {
this.textEditor = await BalloonEditor.create(this.$component[0], { this.textEditor = await BalloonEditor.create(this.$editorEl[0], {
placeholder: "Type the content of your note here ..." placeholder: "Type the content of your note here ..."
}); });

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

@ -135,13 +135,16 @@ ul.fancytree-container {
.note-detail-text h6 { font-size: 1.1em; } .note-detail-text h6 { font-size: 1.1em; }
.note-detail-text { .note-detail-text {
overflow: auto;
font-family: var(--detail-text-font-family);
}
.note-detail-text-editor {
padding-top: 10px;
border: 0 !important; border: 0 !important;
box-shadow: none !important; box-shadow: none !important;
/* This is because with empty content height of editor is 0 and it's impossible to click into it */ /* This is because with empty content height of editor is 0 and it's impossible to click into it */
min-height: 200px; min-height: 200px;
padding-top: 10px;
overflow: auto;
font-family: var(--detail-text-font-family);
} }
.note-detail-text p:first-child, .note-detail-text::before { .note-detail-text p:first-child, .note-detail-text::before {

4
src/views/tabs.ejs
View File

@ -11,7 +11,9 @@
<table class="note-detail-promoted-attributes"></table> <table class="note-detail-promoted-attributes"></table>
<div class="note-detail-component-wrapper"> <div class="note-detail-component-wrapper">
<div class="note-detail-text note-detail-component" tabindex="10000"></div> <div class="note-detail-text note-detail-component" tabindex="10000">
<div class="note-detail-text-editor"></div>
</div>
<div class="note-detail-code note-detail-component"></div> <div class="note-detail-code note-detail-component"></div>