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

Merge branch 'stable'

Browse Source
This commit is contained in:
zadam 2019-07-03 20:51:34 +02:00
commit 070e8d9647
7 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.33.5", "version": "0.33.6",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -2,7 +2,7 @@
"name": "trilium", "name": "trilium",
"productName": "Trilium Notes", "productName": "Trilium Notes",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.33.5", "version": "0.33.6",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"bin": { "bin": {

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

@ -14,6 +14,7 @@ class NoteDetailCode {
this.ctx = ctx; this.ctx = ctx;
this.codeEditor = null; this.codeEditor = null;
this.$component = ctx.$tabContent.find('.note-detail-code'); this.$component = ctx.$tabContent.find('.note-detail-code');
this.$editorEl = this.$component.find('.note-detail-code-editor');
this.$executeScriptButton = ctx.$tabContent.find(".execute-script-button"); this.$executeScriptButton = ctx.$tabContent.find(".execute-script-button");
utils.bindElShortcut(ctx.$tabContent, "ctrl+return", () => this.executeCurrentNote()); utils.bindElShortcut(ctx.$tabContent, "ctrl+return", () => this.executeCurrentNote());
@ -34,7 +35,7 @@ class NoteDetailCode {
CodeMirror.modeURL = 'libraries/codemirror/mode/%N/%N.js'; CodeMirror.modeURL = 'libraries/codemirror/mode/%N/%N.js';
this.codeEditor = CodeMirror(this.$component[0], { this.codeEditor = CodeMirror(this.$editorEl[0], {
value: "", value: "",
viewportMargin: Infinity, viewportMargin: Infinity,
indentUnit: 4, indentUnit: 4,

6
src/public/javascripts/services/tab_context.js
View File

@ -83,7 +83,11 @@ class TabContext {
if (utils.isDesktop()) { if (utils.isDesktop()) {
// keyboard plugin is not loaded in mobile // keyboard plugin is not loaded in mobile
this.$noteTitle.bind('keydown', 'return', () => this.getComponent().focus()); this.$noteTitle.bind('keydown', 'return', () => {
this.getComponent().focus();
return false; // to not propagate the enter into the editor (causes issues with codemirror)
});
} }
this.$protectButton = this.$tabContent.find(".protect-button"); this.$protectButton = this.$tabContent.find(".protect-button");

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

@ -357,10 +357,13 @@ div.ui-tooltip {
} }
.note-detail-code { .note-detail-code {
min-height: 200px;
overflow: auto; overflow: auto;
} }
.note-detail-code-editor {
min-height: 200px;
}
.note-detail-render { .note-detail-render {
min-height: 200px; min-height: 200px;
} }

2
src/services/build.js
View File

@ -1 +1 @@
module.exports = { buildDate:"2019-06-30T21:47:04+02:00", buildRevision: "af21dd4463afdb901a27a075228a4bdf4cd5ecb5" }; module.exports = { buildDate:"2019-07-02T22:26:05+02:00", buildRevision: "196264b8c2fc626e3114d65423c7110cff99ae85" };

4
src/views/tabs.ejs
View File

@ -15,7 +15,9 @@
<div class="note-detail-text-editor" tabindex="10000"></div> <div class="note-detail-text-editor" tabindex="10000"></div>
</div> </div>
<div class="note-detail-code note-detail-component"></div> <div class="note-detail-code note-detail-component">
<div class="note-detail-code-editor"></div>
</div>
<% include details/empty.ejs %> <% include details/empty.ejs %>