絵文字ボックスが閉じない不具合 #19

app/js/tl/parse.js

@@ -615,21 +615,22 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		//Cards
 		if (!card && toot.card) {
 			var cards=toot.card;
-			if (cards.provider_name=="Twitter"){
+				if (cards.provider_name=="Twitter"){
-				if(cards.image){
+					if(cards.image){
-					var twiImg='<br><img src="'+cards.image+'">';
+						var twiImg='<br><img src="'+cards.image+'">';
-				}else{
+					}else{
-					var twiImg='';
+						var twiImg='';
+					}
+					analyze='<blockquote class="twitter-tweet"><b>'+escapeHTML(cards.author_name)+'</b><br>'+escapeHTML(cards.description)+twiImg+'</blockquote>';
 				}
-				analyze='<blockquote class="twitter-tweet"><b>'+escapeHTML(cards.author_name)+'</b><br>'+escapeHTML(cards.description)+twiImg+'</blockquote>';
+				if (cards.title) {
-			}
+					analyze="<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(cards.title) + "<br>" +
-			if (cards.title) {
+						escapeHTML(cards.description) + "</span>";
-				analyze="<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(cards.title) + "<br>" +
+				}
-					escapeHTML(cards.description) + "</span>";
+				if (cards.html) {
-			}
+					analyze=cards.html+'<i class="material-icons" onclick="pip('+id+')" title="'+lang.lang_cards_pip+'">picture_in_picture_alt</i>';
-			if (cards.html) {
+				}
-				analyze=cards.html+'<i class="material-icons" onclick="pip('+id+')" title="'+lang.lang_cards_pip+'">picture_in_picture_alt</i>';
+			
-			}
 		}
 		//Ticker
 		var tickerdom="";

app/main.js

@@ -15,7 +15,8 @@ const join = require('path').join;
 // linuxの時は定義しない
 /*if (process.platform=='win32') {
   const {NowPlaying,PlayerName} = require("nowplaying-node");
-}*/
+}
+*/
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール

app/package-lock.json

@@ -1,9 +1,15 @@
 {
   "name": "thedesk",
-  "version": "17.0.1",
+  "version": "17.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@types/node": {
+      "version": "10.12.29",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.29.tgz",
+      "integrity": "sha512-J/tnbnj8HcsBgCe2apZbdUpQ7hs4d7oZNTYA5bekWdP0sr2NGsOpI/HRdDroEi209tEvTcTtxhD0FfED3DhEcw==",
+      "dev": true
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -596,22 +602,16 @@
       }
     },
     "electron": {
-      "version": "3.1.2",
+      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-3.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.6.tgz",
-      "integrity": "sha512-B/mXRCN8jGBBx8dvtIgLyW+nE8i9y7K9G6wijU+cLoneqF5al9BgZA1l5xgZEiUrwTtt0cgXIWNwhStt7EDoQQ==",
+      "integrity": "sha512-r2ow/EmDibjoCNJp35mB1CcPs2xBF9fp2eoWuUOJmpVQyzdba6EnqsSD1BxwXzF9vQ5WkQ2UbfXBIvpomrdioQ==",
       "dev": true,
       "requires": {
-        "@types/node": "^8.0.24",
+        "@types/node": "^10.12.18",
         "electron-download": "^4.1.0",
         "extract-zip": "^1.0.3"
       },
       "dependencies": {
-        "@types/node": {
-          "version": "8.10.39",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.39.tgz",
-          "integrity": "sha512-rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA==",
-          "dev": true
-        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -649,15 +649,6 @@
             "universalify": "^0.1.0"
           }
         },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",

app/package.json

@@ -52,7 +52,8 @@
       "icon": "thedesk.ico",
       "target": [
         "nsis",
-        "portable"
+        "portable",
+        "appx"
       ]
     },
     "nsis": {

app/view/en/index.html

@@ -200,7 +200,7 @@ var tlid=0;
 <div id="emoji" class="hide shared z-depth-4">
 	<span class="gray sml">
 		<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="Close this box" data-trans-title="post_box_close">cancel</i>
+		<i class="material-icons waves-effect" onclick="emojiToggle()" title="Close this box" data-trans-title="post_box_close">cancel</i>
 	<br>
 	</span>
 	<div id="emoji-list" class="" style="">

app/view/ja/index.html

@@ -200,7 +200,7 @@ var tlid=0;
 <div id="emoji" class="hide shared z-depth-4">
 	<span class="gray sml">サーバーによって実装が異なります。
 		<a onclick="emojiGet('true')" class="pointer">絵文字更新</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="このボックスを閉じる" data-trans-title="post_box_close">cancel</i>
+		<i class="material-icons waves-effect" onclick="emojiToggle()" title="このボックスを閉じる" data-trans-title="post_box_close">cancel</i>
 	<br>
 	</span>
 	<div id="emoji-list" class="" style="">

app/view/make/index.sample.html

@@ -200,7 +200,7 @@ var tlid=0;
 <div id="emoji" class="hide shared z-depth-4">
 	<span class="gray sml">{{emojiWarn}}
 		<a onclick="emojiGet('true')" class="pointer">{{refreshEmoji}}</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="{{closeThisBox}}" data-trans-title="post_box_close">cancel</i>
+		<i class="material-icons waves-effect" onclick="emojiToggle()" title="{{closeThisBox}}" data-trans-title="post_box_close">cancel</i>
 	<br>
 	</span>
 	<div id="emoji-list" class="" style="">

app/view/ps/index.html

@@ -200,7 +200,7 @@ var tlid=0;
 <div id="emoji" class="hide shared z-depth-4">
 	<span class="gray sml">crwdns409:0crwdne409:0
 		<a onclick="emojiGet('true')" class="pointer">crwdns411:0crwdne411:0</a>
-		<i class="material-icons waves-effect" onclick="emoji()" title="crwdns412:0crwdne412:0" data-trans-title="post_box_close">cancel</i>
+		<i class="material-icons waves-effect" onclick="emojiToggle()" title="crwdns412:0crwdne412:0" data-trans-title="post_box_close">cancel</i>
 	<br>
 	</span>
 	<div id="emoji-list" class="" style="">