diff --git a/app/js/platform/preload.js b/app/js/platform/preload.js
index 9326d86c..1a53a3f5 100644
--- a/app/js/platform/preload.js
+++ b/app/js/platform/preload.js
@@ -44,9 +44,13 @@ onmessage = function (e) {
} else if (e.data[0] == "itunes") {
if (ipc.listenerCount('itunes-np') > 0) {
return false;
- }else{
+ } else {
ipc.send("itunes", e.data[1])
}
+ } else if (e.data[0] == "themeCSSRequest") {
+ ipc.send('theme-css-request', e.data[1]);
+ } else if (e.data[0] == "downloadButton") {
+ ipc.send('download-btn', e.data[1]);
}
}
//version.js
@@ -219,7 +223,7 @@ ipc.on('theme-json-response', function (event, args) {
});
ipc.on('theme-json-create-complete', function (event, args) {
clearCustomImport()
- ctLoad()
+ ctLoad()
});
//spotify.js
ipc.once('itunes-np', function (event, arg) {
@@ -232,6 +236,13 @@ ipc.on('memory', function (event, arg) {
var total = arg[2]
renderMem(use, cpu, total)
})
+//update.html
+ipc.on('prog', function (event, arg) {
+ updateProg(arg)
+})
+ipc.on('mess', function (event, arg) {
+ updateMess(arg)
+})
/*
var webviewDom = document.getElementById('webview');
const {
diff --git a/app/js/ui/theme.js b/app/js/ui/theme.js
index 0d550e56..2c8d422c 100644
--- a/app/js/ui/theme.js
+++ b/app/js/ui/theme.js
@@ -21,7 +21,7 @@ function themes(theme) {
}
if (theme == "custom") {
if (localStorage.getItem("customtheme-id")) {
- ipc.send('theme-css-request', localStorage.getItem("customtheme-id"));
+ postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*")
}
}
}
diff --git a/app/view/en/index.html b/app/view/en/index.html
index 9686b34b..90cfb5bd 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -214,9 +214,6 @@
- -
- Adobe Photo Editor
-
-
NowPlaying(Spotify)
diff --git a/app/view/en/update.html b/app/view/en/update.html
index 0320ec1c..6de9c6b7 100644
--- a/app/view/en/update.html
+++ b/app/view/en/update.html
@@ -135,9 +135,6 @@
$("#skipper").toggleClass("show");
}
}
- var electron = require("electron");
- var ipc = electron.ipcRenderer;
- //var shell = electron.shell;
verck();
function update(sel) {
$("#box").toggleClass("show");
@@ -186,22 +183,22 @@
shell.openExternal(url);
return false;
}
- ipc.send('download-btn', [url, file]);
+ postMessage(["downloadButton", [url, file]], "*")
});
}
function quit() {
- ipc.send('quit', 'go');
+ postMessage(["sendSinmpleIpc", "quit"], "*")
}
- ipc.on('prog', function (event, arg) {
+ function updateProg(arg) {
console.log(arg);
- $(".determinate").css("width",arg*100+"%");
+ $(".determinate").css("width", arg * 100 + "%");
$("#prog").text(Math.floor(arg * 100) + "%");
- })
- ipc.on('mess', function (event, arg) {
+ }
+ function updateMess(arg) {
console.log(arg);
$("#prog").text(arg);
- })
+ }
function verck() {
var remote = electron.remote;
var platform = remote.process.platform;
diff --git a/app/view/ja/index.html b/app/view/ja/index.html
index ec6efffb..89aafdd1 100644
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -214,9 +214,6 @@
- -
- Adobeフォトエディタ
-
-
NowPlaying(Spotify)
diff --git a/app/view/ja/update.html b/app/view/ja/update.html
index 5b677571..9f488c78 100644
--- a/app/view/ja/update.html
+++ b/app/view/ja/update.html
@@ -135,9 +135,6 @@
$("#skipper").toggleClass("show");
}
}
- var electron = require("electron");
- var ipc = electron.ipcRenderer;
- //var shell = electron.shell;
verck();
function update(sel) {
$("#box").toggleClass("show");
@@ -186,22 +183,22 @@
shell.openExternal(url);
return false;
}
- ipc.send('download-btn', [url, file]);
+ postMessage(["downloadButton", [url, file]], "*")
});
}
function quit() {
- ipc.send('quit', 'go');
+ postMessage(["sendSinmpleIpc", "quit"], "*")
}
- ipc.on('prog', function (event, arg) {
+ function updateProg(arg) {
console.log(arg);
- $(".determinate").css("width",arg*100+"%");
+ $(".determinate").css("width", arg * 100 + "%");
$("#prog").text(Math.floor(arg * 100) + "%");
- })
- ipc.on('mess', function (event, arg) {
+ }
+ function updateMess(arg) {
console.log(arg);
$("#prog").text(arg);
- })
+ }
function verck() {
var remote = electron.remote;
var platform = remote.process.platform;
diff --git a/app/view/make/update.sample.html b/app/view/make/update.sample.html
index 2983551d..ad3dbdb2 100644
--- a/app/view/make/update.sample.html
+++ b/app/view/make/update.sample.html
@@ -135,9 +135,6 @@
$("#skipper").toggleClass("show");
}
}
- var electron = require("electron");
- var ipc = electron.ipcRenderer;
- //var shell = electron.shell;
verck();
function update(sel) {
$("#box").toggleClass("show");
@@ -186,22 +183,22 @@
shell.openExternal(url);
return false;
}
- ipc.send('download-btn', [url, file]);
+ postMessage(["downloadButton", [url, file]], "*")
});
}
function quit() {
- ipc.send('quit', 'go');
+ postMessage(["sendSinmpleIpc", "quit"], "*")
}
- ipc.on('prog', function (event, arg) {
+ function updateProg(arg) {
console.log(arg);
- $(".determinate").css("width",arg*100+"%");
+ $(".determinate").css("width", arg * 100 + "%");
$("#prog").text(Math.floor(arg * 100) + "%");
- })
- ipc.on('mess', function (event, arg) {
+ }
+ function updateMess(arg) {
console.log(arg);
$("#prog").text(arg);
- })
+ }
function verck() {
var remote = electron.remote;
var platform = remote.process.platform;
diff --git a/app/view/ps/index.html b/app/view/ps/index.html
index e3fe9ba9..cf24d52e 100644
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -214,9 +214,6 @@
- -
- crwdns392:0crwdne392:0
-
-
crwdns1880:0crwdne1880:0
diff --git a/app/view/ps/update.html b/app/view/ps/update.html
index 11a2738c..1a8d7fbc 100644
--- a/app/view/ps/update.html
+++ b/app/view/ps/update.html
@@ -135,9 +135,6 @@
$("#skipper").toggleClass("show");
}
}
- var electron = require("electron");
- var ipc = electron.ipcRenderer;
- //var shell = electron.shell;
verck();
function update(sel) {
$("#box").toggleClass("show");
@@ -186,22 +183,22 @@
shell.openExternal(url);
return false;
}
- ipc.send('download-btn', [url, file]);
+ postMessage(["downloadButton", [url, file]], "*")
});
}
function quit() {
- ipc.send('quit', 'go');
+ postMessage(["sendSinmpleIpc", "quit"], "*")
}
- ipc.on('prog', function (event, arg) {
+ function updateProg(arg) {
console.log(arg);
- $(".determinate").css("width",arg*100+"%");
+ $(".determinate").css("width", arg * 100 + "%");
$("#prog").text(Math.floor(arg * 100) + "%");
- })
- ipc.on('mess', function (event, arg) {
+ }
+ function updateMess(arg) {
console.log(arg);
$("#prog").text(arg);
- })
+ }
function verck() {
var remote = electron.remote;
var platform = remote.process.platform;