Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Desktop: use nodeIntegration

pull/1257/head
Laurent Cozic 2019-02-24 10:17:37 +00:00
parent 22cacd2c5b
commit 7d6b7e588c
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ElectronClient/app/ElectronAppWrapper.js
View File

@ -54,6 +54,9 @@ class ElectronAppWrapper {
y: windowState.y, y: windowState.y,
width: windowState.width, width: windowState.width,
height: windowState.height, height: windowState.height,
webPreferences: {
nodeIntegration: true,
},
}; };
// Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098 // Linux icon workaround for bug https://github.com/electron-userland/electron-builder/issues/2098

5
ElectronClient/app/index.html
View File

@ -2,6 +2,11 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<!--
No CPS because we need to allow everything due to some dependencies (eg. depd, which comes from maybe Node or Electron
uses 'eval'.
<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' 'unsafe-eval'">
-->
<title>Joplin</title> <title>Joplin</title>
<link rel="stylesheet" href="style.css"> <link rel="stylesheet" href="style.css">
<link rel="stylesheet" href="css/fork-awesome.min.css"> <link rel="stylesheet" href="css/fork-awesome.min.css">

1
ReactNativeClient/lib/WebDavApi.js
View File

@ -205,6 +205,7 @@ class WebDavApi {
requestToCurl_(url, options) { requestToCurl_(url, options) {
let output = []; let output = [];
output.push('curl'); output.push('curl');
output.push('-v');
if (options.method) output.push('-X ' + options.method); if (options.method) output.push('-X ' + options.method);
if (options.headers) { if (options.headers) {
for (let n in options.headers) { for (let n in options.headers) {