diff --git a/app/about.html b/app/about.html index 6be07cd7..c2814fc0 100644 --- a/app/about.html +++ b/app/about.html @@ -104,13 +104,13 @@ class="material-icons left">closeClose \ No newline at end of file diff --git a/app/js/platform/first.js b/app/js/platform/first.js index eb100bcb..2ec21109 100644 --- a/app/js/platform/first.js +++ b/app/js/platform/first.js @@ -1,6 +1,3 @@ -//jQuery読む -window.jQuery = window.$ = require('../../js/common/jquery.js'); -var Hammer = require('../../js/common/hammer.min.js'); $.strip_tags = function (str, allowed) { if (!str) { return ""; diff --git a/app/js/platform/preload.js b/app/js/platform/preload.js index 1a53a3f5..3585538b 100644 --- a/app/js/platform/preload.js +++ b/app/js/platform/preload.js @@ -243,12 +243,13 @@ ipc.on('prog', function (event, arg) { ipc.on('mess', function (event, arg) { updateMess(arg) }) -/* +//about.html +ipc.on('aboutData', function (event, arg) { + renderAbout(arg) +}) var webviewDom = document.getElementById('webview'); -const { - shell -} = require('electron'); -webviewDom.addEventListener('new-window', function (e) { - shell.openExternal(e.url); -}); -*/ \ No newline at end of file +if(webviewDom){ + webviewDom.addEventListener('new-window', function (e) { + shell.openExternal(e.url); + }); +} diff --git a/app/main/system.js b/app/main/system.js index 47d6b8d4..86c4efa4 100644 --- a/app/main/system.js +++ b/app/main/system.js @@ -144,9 +144,10 @@ function system(mainWindow, dir, lang) { about(); }); - + ipc.on('aboutData', (e, args) => { + e.sender.webContents.send('aboutDataRender', process); + }); function about() { - var ver = app.getVersion() var window = new BrowserWindow({ webPreferences: {