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 1 Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
azivner 2018-02-15 23:24:02 -05:00
commit 6b9ff47c88
5 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
electron.js
View File

@ -3,11 +3,11 @@
const electron = require('electron'); const electron = require('electron');
const path = require('path'); const path = require('path');
const config = require('./src/services/config'); const config = require('./src/services/config');
const log = require('./src/services/log');
const url = require("url"); const url = require("url");
const app = electron.app; const app = electron.app;
const globalShortcut = electron.globalShortcut; const globalShortcut = electron.globalShortcut;
const clipboard = electron.clipboard;
// Adds debug features like hotkeys for triggering dev tools and reload // Adds debug features like hotkeys for triggering dev tools and reload
require('electron-debug')(); require('electron-debug')();
@ -70,7 +70,7 @@ app.on('activate', () => {
app.on('ready', () => { app.on('ready', () => {
mainWindow = createMainWindow(); mainWindow = createMainWindow();
globalShortcut.register('CommandOrControl+Alt+P', async () => { const result = globalShortcut.register('CommandOrControl+Alt+P', async () => {
const date_notes = require('./src/services/date_notes'); const date_notes = require('./src/services/date_notes');
const utils = require('./src/services/utils'); const utils = require('./src/services/utils');
@ -81,6 +81,10 @@ app.on('ready', () => {
mainWindow.webContents.send('create-day-sub-note', parentNoteId); mainWindow.webContents.send('create-day-sub-note', parentNoteId);
}); });
if (!result) {
log.error("Could not register global shortcut CTRL+ALT+P");
}
}); });
app.on('will-quit', () => { app.on('will-quit', () => {

78
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.4.1", "version": "0.6.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -3061,19 +3061,19 @@
"integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=" "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo="
}, },
"electron": { "electron": {
"version": "1.8.2-beta.4", "version": "1.8.2",
"resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.4.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2.tgz",
"integrity": "sha1-GDayBO6s6dx3Bi7Ugg/bxsvZoZU=", "integrity": "sha512-0TV5Hy92g8ACnPn+PVol6a/2uk+khzmRtWxhah/FcKs6StCytm5hD14QqOdZxEdJN8HljXIVCayN/wJX+0wDiQ==",
"requires": { "requires": {
"@types/node": "8.5.9", "@types/node": "8.9.4",
"electron-download": "3.3.0", "electron-download": "3.3.0",
"extract-zip": "1.6.5" "extract-zip": "1.6.5"
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "8.5.9", "version": "8.9.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.4.tgz",
"integrity": "sha512-s+c3AjymyAccTI4hcgNFK4mToH8l+hyPDhu4LIkn71lRy56FLijGu00fyLgldjM/846Pmk9N4KFUs2P8GDs0pA==" "integrity": "sha512-dSvD36qnQs78G1BPsrZFdPpvLgMW/dnvr5+nTW2csMs5TiP9MOXrjUbnMZOEwnIuBklXtn7b6TPA2Cuq07bDHA=="
} }
} }
}, },
@ -3325,9 +3325,9 @@
} }
}, },
"electron-packager": { "electron-packager": {
"version": "10.1.1", "version": "11.0.1",
"resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-10.1.1.tgz", "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-11.0.1.tgz",
"integrity": "sha1-MWp/ossf/CYz9YBcn8IJE8vAnZQ=", "integrity": "sha1-wtH/nsqBEL6evIGCbiqSHATRIA4=",
"dev": true, "dev": true,
"requires": { "requires": {
"asar": "0.14.0", "asar": "0.14.0",
@ -3343,13 +3343,19 @@
"pify": "3.0.0", "pify": "3.0.0",
"plist": "2.1.0", "plist": "2.1.0",
"pruner": "0.0.7", "pruner": "0.0.7",
"rcedit": "0.9.0", "rcedit": "1.0.0",
"resolve": "1.4.0", "resolve": "1.4.0",
"sanitize-filename": "1.6.1", "sanitize-filename": "1.6.1",
"semver": "5.4.1", "semver": "5.4.1",
"yargs-parser": "8.1.0" "yargs-parser": "9.0.2"
}, },
"dependencies": { "dependencies": {
"camelcase": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
"dev": true
},
"electron-download": { "electron-download": {
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz", "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz",
@ -3437,6 +3443,12 @@
"integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
"dev": true "dev": true
}, },
"rcedit": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.0.0.tgz",
"integrity": "sha512-W7DNa34x/3OgWyDHsI172AG/Lr/lZ+PkavFkHj0QhhkBRcV9QTmRJE1tDKrWkx8XHPSBsmZkNv9OKue6pncLFQ==",
"dev": true
},
"sumchecker": { "sumchecker": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
@ -3456,20 +3468,29 @@
} }
} }
} }
},
"yargs-parser": {
"version": "9.0.2",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
"integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
"dev": true,
"requires": {
"camelcase": "4.1.0"
}
} }
} }
}, },
"electron-prebuilt-compile": { "electron-prebuilt-compile": {
"version": "1.8.2-beta.4", "version": "1.8.2",
"resolved": "https://registry.npmjs.org/electron-prebuilt-compile/-/electron-prebuilt-compile-1.8.2-beta.4.tgz", "resolved": "https://registry.npmjs.org/electron-prebuilt-compile/-/electron-prebuilt-compile-1.8.2.tgz",
"integrity": "sha512-whVdRgFEDovWSFrAsbMXIiush6RQ8IV3XhYdL59zShck4U1eXGmdkaBCy+2tlkGmUGr0fRu+S4FpUx2ebBkRhQ==", "integrity": "sha512-wiDVjy8S0PA/K/TUM0lw5gzZ+SmyVVGQ0qt9iFYXHJc6t8TzDXFY3DsoK37H3A7nWnkvXvoPdpJ5/h9KbTMoAw==",
"dev": true, "dev": true,
"requires": { "requires": {
"babel-plugin-array-includes": "2.0.3", "babel-plugin-array-includes": "2.0.3",
"babel-plugin-transform-async-to-generator": "6.24.1", "babel-plugin-transform-async-to-generator": "6.24.1",
"babel-preset-es2016-node5": "1.1.2", "babel-preset-es2016-node5": "1.1.2",
"babel-preset-react": "6.24.1", "babel-preset-react": "6.24.1",
"electron": "1.8.2-beta.4", "electron": "1.8.2",
"electron-compile": "6.4.2", "electron-compile": "6.4.2",
"electron-compilers": "5.9.0", "electron-compilers": "5.9.0",
"yargs": "6.6.0" "yargs": "6.6.0"
@ -8472,12 +8493,6 @@
} }
} }
}, },
"rcedit": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/rcedit/-/rcedit-0.9.0.tgz",
"integrity": "sha1-ORDfVzRTmeKwMl9KUZAH+J5V7xw=",
"dev": true
},
"read-all-stream": { "read-all-stream": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
@ -11694,23 +11709,6 @@
} }
} }
}, },
"yargs-parser": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
"integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
"dev": true,
"requires": {
"camelcase": "4.1.0"
},
"dependencies": {
"camelcase": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
"dev": true
}
}
},
"yauzl": { "yauzl": {
"version": "2.4.1", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",

8
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "trilium", "name": "trilium",
"description": "Trilium Notes", "description": "Trilium Notes",
"version": "0.6.1", "version": "0.6.2",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"main": "electron.js", "main": "electron.js",
"repository": { "repository": {
@ -27,7 +27,7 @@
"debug": "~3.1.0", "debug": "~3.1.0",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"ejs": "~2.5.7", "ejs": "~2.5.7",
"electron": "^1.8.2-beta.4", "electron": "^1.8.2",
"electron-debug": "^1.5.0", "electron-debug": "^1.5.0",
"electron-in-page-search": "^1.2.4", "electron-in-page-search": "^1.2.4",
"express": "~4.16.2", "express": "~4.16.2",
@ -60,8 +60,8 @@
}, },
"devDependencies": { "devDependencies": {
"electron-compile": "^6.4.2", "electron-compile": "^6.4.2",
"electron-packager": "^10.1.1", "electron-packager": "^11.0.1",
"electron-prebuilt-compile": "1.8.2-beta.4", "electron-prebuilt-compile": "1.8.2",
"electron-rebuild": "^1.7.3", "electron-rebuild": "^1.7.3",
"tape": "^4.8.0", "tape": "^4.8.0",
"xo": "^0.18.0" "xo": "^0.18.0"

4
src/public/javascripts/init.js
View File

@ -207,9 +207,11 @@ if (isElectron()) {
await noteTree.activateNode(parentNoteId); await noteTree.activateNode(parentNoteId);
setTimeout(() => {
const node = noteTree.getCurrentNode(); const node = noteTree.getCurrentNode();
await noteTree.createNote(node, node.data.noteId, 'into', node.data.isProtected); noteTree.createNote(node, node.data.noteId, 'into', node.data.isProtected);
}, 500);
}); });
} }

2
src/services/log.js
View File

@ -22,7 +22,7 @@ function info(message) {
function error(message) { function error(message) {
// we're using .info() instead of .error() because simple-node-logger emits weird error for showError() // we're using .info() instead of .error() because simple-node-logger emits weird error for showError()
info(message); info("ERROR: " + message);
} }
const requestBlacklist = [ "/libraries", "/javascripts", "/images", "/stylesheets" ]; const requestBlacklist = [ "/libraries", "/javascripts", "/images", "/stylesheets" ];