From dda94698743ee8306c12a4f9484cd45140c70a9e Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Sun, 16 Jun 2019 01:08:10 +0900
Subject: [PATCH] TheDesk Usamin (18.6.0) - fix

---
 app/about.html                  | 36 ++++++++++++++++-----------------
 app/js/platform/preload.js      |  9 ++++-----
 app/js/ui/layout.js             |  3 +--
 app/main.js                     | 19 +++++++++--------
 app/main/dl.js                  |  5 ++---
 app/main/language.js            | 35 +++++++++++++++++++++-----------
 app/main/system.js              | 15 ++++----------
 app/package.json                |  1 +
 app/view/en/index.html          |  3 ++-
 app/view/ja/index.html          |  3 ++-
 app/view/make/index.sample.html |  3 ++-
 app/view/ps/index.html          |  3 ++-
 package-lock.json               |  3 ---
 13 files changed, 71 insertions(+), 67 deletions(-)
 delete mode 100644 package-lock.json

diff --git a/app/about.html b/app/about.html
index 3a88f050..42198a42 100644
--- a/app/about.html
+++ b/app/about.html
@@ -78,19 +78,19 @@
     <script type="text/javascript" src="./js/common/jquery.js"></script>
     <script type="text/javascript" src="./js/platform/first-not-view.js"></script>
     <script type="text/javascript" src="./js/common/materialize.js"></script>
-    <img src="./img/desk.png" style="max-width:70%;">
+    <img src="./img/desk.png" style="max-width:62%;">
     <h5>TheDesk</h5>
-    <div class='container'>
-        <div class='area-name1'>Display version</div>
-        <div class='area-data1' id="now"></div>
-        <div class='area-name2'>Internal version</div>
-        <div class='area-data2' id="ver"></div>
-        <div class='area-name3'>Chromium</div>
-        <div class='area-data3' id="chrome"></div>
-        <div class='area-name4'>Electron</div>
-        <div class='area-data4' id="electron"></div>
-        <div class='area-name5'>Node.js</div>
-        <div class='area-data5' id="node"></div>
+    <div class="container">
+        <div class="area-name1">Display version</div>
+        <div class="area-data1" id="now"></div>
+        <div class="area-name2">Internal version</div>
+        <div class="area-data2" id="ver"></div>
+        <div class="area-name3">Chromium</div>
+        <div class="area-data3" id="chrome"></div>
+        <div class="area-name4">Electron</div>
+        <div class="area-data4" id="electron"></div>
+        <div class="area-name5">Node.js</div>
+        <div class="area-data5" id="node"></div>
     </div>
     <div class="cp">Copyright &copy; TheDesk 2018<br>
         Main developer(author): <a href="https://cutls.com/@Cutls" target="_blank">Cutls P</a><br>
@@ -104,13 +104,11 @@
             class="material-icons left">close</i>Close</button>
     <script type="text/javascript" src="./js/ui/theme.js"></script>
     <script>
-        postMessage(["sendSinmpleIpc", "aboutData"], "*")
-        function renderAbout(args) {
-            $("#now").text(localStorage.getItem("ver"));
-            $("#node").text(args[0]);
-            $("#chrome").text(args[1]);
-            $("#electron").text(args[2]);
-        }
+        var about = JSON.parse(localStorage.getItem("about"));
+        $("#now").text(localStorage.getItem("ver"));
+        $("#node").text(about[0]);
+        $("#chrome").text(about[1]);
+        $("#electron").text(about[2]);
         if (location.search) {
             var m = location.search.match(/\?ver=([a-zA-Z-0-9.]+)/);
             var ver = m[1];
diff --git a/app/js/platform/preload.js b/app/js/platform/preload.js
index 3d845c71..eda3bfd7 100644
--- a/app/js/platform/preload.js
+++ b/app/js/platform/preload.js
@@ -41,7 +41,9 @@ onmessage = function (e) {
     } else if (e.data[0] == "themeJsonRequest") {
         ipc.send('theme-json-request', e.data[1]);
     } else if (e.data[0] == "ha") {
-        ipc.send('ha', had);
+        ipc.send('ha', e.data[1]);
+    } else if (e.data[0] == "aboutData") {
+        ipc.send('aboutData', "");
     } else if (e.data[0] == "itunes") {
         console.log("NowPlaying" + ipc.listenerCount('itunes-np'))
         if (ipc.listenerCount('itunes-np') > 1) {
@@ -60,6 +62,7 @@ ipc.send("getPlatform", "")
 ipc.on('platform', function (event, args) {
     localStorage.setItem("platform", args[0])
     localStorage.setItem("bit", args[1])
+    localStorage.setItem("about", JSON.stringify([args[2], args[3], args[4]]))
 })
 ipc.on('winstore', function (event, arg) {
     localStorage.setItem("winstore", arg)
@@ -239,10 +242,6 @@ ipc.on('prog', function (event, arg) {
 ipc.on('mess', function (event, arg) {
     postMessage(["updateMess", arg], "*")
 })
-//about.html
-ipc.on('aboutDataRender', function (event, arg) {
-    postMessage(["renderAbout", arg], "*")
-})
 var webviewDom = document.getElementById('webview');
 if (webviewDom) {
     webviewDom.addEventListener('new-window', function (e) {
diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js
index 17074f20..e6e3bb92 100644
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -460,8 +460,7 @@ function webviewParse(url, key, insert, icnsert, css) {
 		'<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		'"></div><div class="column-hide notf-indv-box" id="util-box_' + key +
 		'" style="padding:5px;">' + lang.lang_layout_headercolor + '<br><div id="picker_' + key + '" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '" style="width:100%;height:100%;"><div id="timeline_' + key +
-		'" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="' + url + '" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js"></webview></div></div></div>';
-
+		'" class="tl" tlid="' + key + '" data-type="webview" style="width:100%;height:100%;"><webview src="' + url + '" style="width:100%;height:100%;" id="webview" preload="./js/platform/twitter.js" nodeintegration="true">disabled</webview></div></div></div>';
 	return html;
 }
 function unstreamingTL(type, key, basekey, insert, icnsert, left_fold, css, animecss, q) {
diff --git a/app/main.js b/app/main.js
index 1ef8ceb3..159dd57a 100644
--- a/app/main.js
+++ b/app/main.js
@@ -96,30 +96,30 @@ function createWindow() {
 	if (platform == "linux") {
 		var arg = {
 			webPreferences: {
-				webviewTag: false,
+				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(__dirname,"js", "platform", "preload.js")
+				preload: join(__dirname, "js", "platform", "preload.js")
 			},
 			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, icon: __dirname + '/desk.png'
 		}
 	} else if (platform == "win32") {
 		var arg = {
 			webPreferences: {
-				webviewTag: false,
+				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(__dirname,"js", "platform", "preload.js")
+				preload: join(__dirname, "js", "platform", "preload.js")
 			},
 			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true
 		}
 	} else if (platform == "darwin") {
 		var arg = {
 			webPreferences: {
-				webviewTag: false,
+				webviewTag: true,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(__dirname,"js", "platform", "preload.js")
+				preload: join(__dirname, "js", "platform", "preload.js")
 			},
 			width: window_size.width, height: window_size.height, x: window_size.x, y: window_size.y, simpleFullscreen: true
 		}
@@ -173,9 +173,12 @@ function createWindow() {
 
 	var platform = process.platform;
 	var bit = process.arch;
-	if (platform == "darwin") {
-		Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, false, dir)));
+	if (process.argv.indexOf("--dev") === -1) {
+		packaged = true;
+	} else {
+		packaged = false;
 	}
+	Menu.setApplicationMenu(Menu.buildFromTemplate(language.template(lang, mainWindow, packaged, dir)));
 	//CSS
 	css.css(mainWindow);
 	//アップデータとダウンロード
diff --git a/app/main/dl.js b/app/main/dl.js
index e7869cc1..220d244f 100644
--- a/app/main/dl.js
+++ b/app/main/dl.js
@@ -24,9 +24,8 @@ function dl(mainWindow, lang_path, base, dirname) {
 				width: 600,
 				height: 400,
 				"transparent": false, // ウィンドウの背景を透過
-				"frame": true, // 枠の無いウィンドウ
-				"resizable": true,
-				"modal": true
+				"frame": false, // 枠の無いウィンドウ
+				"resizable": false
 			});
 			var lang = fs.readFileSync(lang_path, 'utf8');
 			updatewin.loadURL(base + lang + '/update.html');
diff --git a/app/main/language.js b/app/main/language.js
index 8bc592cf..22e50afa 100644
--- a/app/main/language.js
+++ b/app/main/language.js
@@ -65,6 +65,28 @@ function templete(lang, mainWindow, packaged, dir) {
             "en": "Close"
         }
     }
+    if(packaged){
+        var ifDev = [
+            {
+                label: dict.reload[lang],
+                accelerator: 'CmdOrCtrl+R',
+                click: function () { mainWindow.reload(); }
+            }
+        ]
+    }else{
+        var ifDev = [
+            {
+                label: 'Toggle Developer Tools',
+                accelerator: 'Alt+Command+I',
+                click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
+            },
+            {
+                label: dict.reload[lang],
+                accelerator: 'CmdOrCtrl+R',
+                click: function () { mainWindow.reload(); }
+            }
+        ]
+    }
     const menu = [{
         label: dict.application[lang],
         submenu: [
@@ -103,18 +125,7 @@ function templete(lang, mainWindow, packaged, dir) {
         ]
     }, {
         label: dict.view[lang],
-        submenu: [
-            {
-                label: 'Toggle Developer Tools',
-                accelerator: 'Alt+Command+I',
-                click: function () { if (!packaged) { mainWindow.toggleDevTools(); } }
-            },
-            {
-                label: dict.reload[lang],
-                accelerator: 'CmdOrCtrl+R',
-                click: function () { mainWindow.reload(); }
-            }
-        ]
+        submenu: ifDev
     },
     {
         label: dict.window[lang],
diff --git a/app/main/system.js b/app/main/system.js
index 13a08b37..f40bf77d 100644
--- a/app/main/system.js
+++ b/app/main/system.js
@@ -42,7 +42,7 @@ function system(mainWindow, dir, lang, dirname) {
 	});
 	//プラットフォーム
 	ipc.on('getPlatform', function (e, arg) {
-		e.sender.webContents.send('platform', [process.platform, process.arch]);
+		e.sender.webContents.send('platform', [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron]);
 	})
 	//言語
 	ipc.on('lang', function (e, arg) {
@@ -137,30 +137,23 @@ function system(mainWindow, dir, lang, dirname) {
 	})
 
 	ipc.on('quit', (e, args) => {
-
 		app.quit();
 	});
 	ipc.on('about', (e, args) => {
-
 		about();
 	});
-	ipc.on('aboutData', (e, args) => {
-		e.sender.webContents.send('aboutDataRender', [process.version, process.versions.chrome, process.versions.electron]);
-	});
 	function about() {
 		var ver = app.getVersion()
 		var window = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
-				nodeIntegration: false,
-				contextIsolation: false,
-				preload: join(dirname,"js", "platform", "preload.js")
+				nodeIntegration: false
 			},
 			width: 300,
 			height: 480,
 			"transparent": false, // ウィンドウの背景を透過
-			"frame": true, // 枠の無いウィンドウ
-			"resizable": true
+			"frame": false, // 枠の無いウィンドウ
+			"resizable": false
 		});
 		window.loadURL(dir + '/about.html?ver=' + ver);
 		return "true"
diff --git a/app/package.json b/app/package.json
index 38753e31..a4a1b88e 100644
--- a/app/package.json
+++ b/app/package.json
@@ -7,6 +7,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "construct": "cd view/make && node make",
+    "dev": "electron ./ --dev",
     "dist": "build --linux snap",
     "build:js": "node build.js",
     "build": "electron-builder",
diff --git a/app/view/en/index.html b/app/view/en/index.html
index d95f705b..428df775 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -684,7 +684,8 @@
 				<h5>Release Note Usamin (18.6.0)</h5>
 				・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
 				・投票済みのアンケートについて修正。<br>
-				・<b>セキュリティの大幅な強化。</b>
+				・<b>セキュリティの大幅な強化。</b><br>
+				・ご注意<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">: TweetDeck統合は設定で有効にしないと使えなくなりました。
 				<br>
 				<h5>ThinkingDeskラベル</h5>
 				<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>
diff --git a/app/view/ja/index.html b/app/view/ja/index.html
index 60f0e66d..52513f09 100644
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -684,7 +684,8 @@
 				<h5>Release Note Usamin (18.6.0)</h5>
 				・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
 				・投票済みのアンケートについて修正。<br>
-				・<b>セキュリティの大幅な強化。</b>
+				・<b>セキュリティの大幅な強化。</b><br>
+				・ご注意<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">: TweetDeck統合は設定で有効にしないと使えなくなりました。
 				<br>
 				<h5>ThinkingDeskラベル</h5>
 				<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index 8c9b99ce..c9a801de 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -684,7 +684,8 @@
 				<h5>Release Note Usamin (18.6.0)</h5>
 				・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
 				・投票済みのアンケートについて修正。<br>
-				・<b>セキュリティの大幅な強化。</b>
+				・<b>セキュリティの大幅な強化。</b><br>
+				・ご注意<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">: TweetDeck統合は設定で有効にしないと使えなくなりました。
 				<br>
 				<h5>ThinkingDeskラベル</h5>
 				<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>
diff --git a/app/view/ps/index.html b/app/view/ps/index.html
index d0f9f970..d6beb1c8 100644
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -684,7 +684,8 @@
 				<h5>Release Note Usamin (18.6.0)</h5>
 				・アカウント選択のデザイン修正。クリック直後に閉じてしまうバグを修正。<br>
 				・投票済みのアンケートについて修正。<br>
-				・<b>セキュリティの大幅な強化。</b>
+				・<b>セキュリティの大幅な強化。</b><br>
+				・ご注意<img class="emoji" draggable="false" alt="⚠️" src="https://twemoji.maxcdn.com/2/72x72/26a0.png">: TweetDeck統合は設定で有効にしないと使えなくなりました。
 				<br>
 				<h5>ThinkingDeskラベル</h5>
 				<img src="../../img/thinkingdesk.png" style="width:100px;" draggable="false"><br>
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 48e341a0..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "lockfileVersion": 1
-}