kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity

disable node-integration so jquery works again

Browse Source
This commit is contained in:
Paul-Vincent Roll 2016-03-28 00:26:24 +02:00
parent d7844a1e39
commit 331c12269c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/electron.js
View File

@ -15,7 +15,7 @@ let mainWindow;
function createWindow () { function createWindow () {
// Create the browser window. // Create the browser window.
mainWindow = new BrowserWindow({width: 800, height: 600, fullscreen: true}); mainWindow = new BrowserWindow({width: 800, height: 600, fullscreen: true, "node-integration": false});
// and load the index.html of the app. // and load the index.html of the app.
mainWindow.loadURL('file://' + __dirname + '../../index.html'); mainWindow.loadURL('file://' + __dirname + '../../index.html');
@ -33,9 +33,9 @@ function createWindow () {
} }
//Start helper scripts //Start helper scripts
var walker = walk.walk(__dirname + '/../modules', { followLinks: false }); var module_loader = walk.walk(__dirname + '/../modules', { followLinks: false });
walker.on('file', function(root, stat, next) { module_loader.on('file', function(root, stat, next) {
if (stat.name == "node_helper.js"){ if (stat.name == "node_helper.js"){
require(root + '/' + stat.name); require(root + '/' + stat.name);
} }
@ -43,7 +43,7 @@ walker.on('file', function(root, stat, next) {
next(); next();
}); });
walker.on('end', function() { module_loader.on('end', function() {
console.log("Helpers startet"); console.log("Helpers startet");
}); });