From 43fa503dcf0a928e33ab35342bd0a6f12e3961b6 Mon Sep 17 00:00:00 2001 From: Theenoro Date: Sun, 24 Sep 2017 18:53:21 +0200 Subject: [PATCH] Rebase --- src/app/js/app.js | 1 + src/app/js/pot_main.js | 3 +-- src/app/js/shared.js | 13 +++++++++++++ src/controller/crawler/vivo.sx.js | 0 4 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/app/js/shared.js create mode 100644 src/controller/crawler/vivo.sx.js diff --git a/src/app/js/app.js b/src/app/js/app.js index c95480a..e7e926d 100644 --- a/src/app/js/app.js +++ b/src/app/js/app.js @@ -1,3 +1,4 @@ +const shared = require(global.__dirname+'/../js/shared'); $(function() { const Config = require('electron-config'); const config = new Config(); diff --git a/src/app/js/pot_main.js b/src/app/js/pot_main.js index 4a42595..3a131f4 100644 --- a/src/app/js/pot_main.js +++ b/src/app/js/pot_main.js @@ -1,3 +1,4 @@ +const shared = require(global.__dirname+'/../js/shared'); $(function() { const ipcRenderer = require('electron').ipcRenderer; ipcRenderer.send('pot_real_open', {x:"xx"}); @@ -20,6 +21,4 @@ $(function() { $('body').on( "mouseenter",function () { $('.navbar').css('opacity',"1") }); - - }) diff --git a/src/app/js/shared.js b/src/app/js/shared.js new file mode 100644 index 0000000..10709c9 --- /dev/null +++ b/src/app/js/shared.js @@ -0,0 +1,13 @@ + +var shared = {}; +var test = ""; + + +shared.setLog = (text)=>{ + test = text; +} +shared.log = ()=>{ + console.log(test); +} + +module.exports = shared; diff --git a/src/controller/crawler/vivo.sx.js b/src/controller/crawler/vivo.sx.js new file mode 100644 index 0000000..e69de29