gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

open update to 7.0

Browse Source
This commit is contained in:
zadam 2019-10-16 19:42:42 +02:00
parent e9ab044e46
commit 6d5762fac8
4 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.35.2", "version": "0.36.0-beta",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -6950,9 +6950,9 @@
"dev": true "dev": true
}, },
"is-wsl": { "is-wsl": {
"version": "1.1.0", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=" "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog=="
}, },
"is-yarn-global": { "is-yarn-global": {
"version": "0.3.0", "version": "0.3.0",
@ -9066,11 +9066,11 @@
"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k="
}, },
"open": { "open": {
"version": "6.4.0", "version": "7.0.0",
"resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", "resolved": "https://registry.npmjs.org/open/-/open-7.0.0.tgz",
"integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", "integrity": "sha512-K6EKzYqnwQzk+/dzJAQSBORub3xlBTxMz+ntpZpH/LyCa1o6KjXhuN+2npAaI9jaSmU3R1Q8NWf4KUWcyytGsQ==",
"requires": { "requires": {
"is-wsl": "^1.1.0" "is-wsl": "^2.1.0"
} }
}, },
"open-editor": { "open-editor": {
@ -9082,6 +9082,23 @@
"env-editor": "^0.4.0", "env-editor": "^0.4.0",
"line-column-path": "^2.0.0", "line-column-path": "^2.0.0",
"open": "^6.2.0" "open": "^6.2.0"
},
"dependencies": {
"is-wsl": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
"integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
"dev": true
},
"open": {
"version": "6.4.0",
"resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
"integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
"dev": true,
"requires": {
"is-wsl": "^1.1.0"
}
}
} }
}, },
"optionator": { "optionator": {

2
package.json
View File

@ -55,7 +55,7 @@
"moment": "2.24.0", "moment": "2.24.0",
"multer": "1.4.2", "multer": "1.4.2",
"node-abi": "2.11.0", "node-abi": "2.11.0",
"open": "6.4.0", "open": "7.0.0",
"pngjs": "3.4.0", "pngjs": "3.4.0",
"portscanner": "2.2.0", "portscanner": "2.2.0",
"rand-token": "0.4.0", "rand-token": "0.4.0",

2
src/public/javascripts/services/note_detail_book.js
View File

@ -195,7 +195,7 @@ class NoteDetailBook {
if (utils.isElectron()) { if (utils.isElectron()) {
const open = require("open"); const open = require("open");
open(getFileUrl()); open(getFileUrl(), {url: true});
} }
else { else {
window.location.href = getFileUrl(); window.location.href = getFileUrl();

2
src/public/javascripts/services/note_detail_file.js
View File

@ -23,7 +23,7 @@ class NoteDetailFile {
if (utils.isElectron()) { if (utils.isElectron()) {
const open = require("open"); const open = require("open");
open(this.getFileUrl()); open(this.getFileUrl(), {url: true});
} }
else { else {
window.location.href = this.getFileUrl(); window.location.href = this.getFileUrl();