diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index e4c5e327..10ba80f3 100644 --- a/app/js/tl/parse.js +++ b/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.image){ - var twiImg='
'; - }else{ - var twiImg=''; + if (cards.provider_name=="Twitter"){ + if(cards.image){ + var twiImg='
'; + }else{ + var twiImg=''; + } + analyze='
'+escapeHTML(cards.author_name)+'
'+escapeHTML(cards.description)+twiImg+'
'; } - analyze='
'+escapeHTML(cards.author_name)+'
'+escapeHTML(cards.description)+twiImg+'
'; - } - if (cards.title) { - analyze="URL"+lang.lang_cards_check+":
Title:" + escapeHTML(cards.title) + "
" + - escapeHTML(cards.description) + "
"; - } - if (cards.html) { - analyze=cards.html+'picture_in_picture_alt'; - } + if (cards.title) { + analyze="URL"+lang.lang_cards_check+":
Title:" + escapeHTML(cards.title) + "
" + + escapeHTML(cards.description) + "
"; + } + if (cards.html) { + analyze=cards.html+'picture_in_picture_alt'; + } + } //Ticker var tickerdom=""; diff --git a/app/main.js b/app/main.js index 54388bb4..34883562 100644 --- a/app/main.js +++ b/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; // ウィンドウを作成するモジュール diff --git a/app/package-lock.json b/app/package-lock.json index a513d2f2..368e1622 100644 --- a/app/package-lock.json +++ b/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", - "resolved": "https://registry.npmjs.org/electron/-/electron-3.1.2.tgz", - "integrity": "sha512-B/mXRCN8jGBBx8dvtIgLyW+nE8i9y7K9G6wijU+cLoneqF5al9BgZA1l5xgZEiUrwTtt0cgXIWNwhStt7EDoQQ==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.6.tgz", + "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", diff --git a/app/package.json b/app/package.json index 391cdb0a..7166f366 100644 --- a/app/package.json +++ b/app/package.json @@ -52,7 +52,8 @@ "icon": "thedesk.ico", "target": [ "nsis", - "portable" + "portable", + "appx" ] }, "nsis": { diff --git a/app/view/en/index.html b/app/view/en/index.html index 01c2f1bf..141ba830 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -200,7 +200,7 @@ var tlid=0;
Refresh emojis list - cancel + cancel
diff --git a/app/view/ja/index.html b/app/view/ja/index.html index d5887a91..58fa1a94 100644 --- a/app/view/ja/index.html +++ b/app/view/ja/index.html @@ -200,7 +200,7 @@ var tlid=0;
サーバーによって実装が異なります。 絵文字更新 - cancel + cancel
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index 5be3ff0e..f611fc03 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -200,7 +200,7 @@ var tlid=0;
{{emojiWarn}} {{refreshEmoji}} - cancel + cancel
diff --git a/app/view/ps/index.html b/app/view/ps/index.html index 5c0ed98f..42cdba79 100644 --- a/app/view/ps/index.html +++ b/app/view/ps/index.html @@ -200,7 +200,7 @@ var tlid=0;
crwdns409:0crwdne409:0 crwdns411:0crwdne411:0 - cancel + cancel