self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Desktop: Fixes #1334 (maybe): Upgraded chokidar which it seems was randomly making Electron 4 crash (maybe due to fsevent package)

Browse Source
This commit is contained in:
Laurent Cozic 2019-03-12 21:41:13 +00:00
parent 20bb1238c5
commit 1602182085
4 changed files with 600 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

634
ElectronClient/app/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
ElectronClient/app/package.json
View File

@ -85,7 +85,7 @@
"app-module-path": "^2.2.0",
"async-mutex": "^0.1.3",
"base-64": "^0.1.0",
"chokidar": "^2.0.3",
"chokidar": "^2.1.2",
"compare-versions": "^3.2.1",
"diacritics": "^1.3.0",
"electron-context-menu": "^0.9.1",

6
ReactNativeClient/lib/BaseApplication.js
View File

@ -156,6 +156,12 @@ class BaseApplication {
continue;
}
if (arg === '--enable-logging') {
// Electron-specific flag used for debugging - ignore it
argv.splice(0, 1);
continue;
}
if (arg.length && arg[0] == '-') {
throw new JoplinError(_('Unknown flag: %s', arg), 'flagError');
} else {

4
ReactNativeClient/lib/MdToHtml/rules/link_open.js
View File

@ -12,9 +12,7 @@ function installRule(markdownIt, mdOptions, ruleOptions) {
const text = utils.getAttr(token.attrs, 'text');
const isResourceUrl = Resource.isResourceUrl(href);
const title = isResourceUrl ? utils.getAttr(token.attrs, 'title') : href;
console.info(href, isResourceUrl);
let resourceIdAttr = "";
let icon = "";
let hrefAttr = '#';