From 4d5916b595ea7de7a0e913f69f13bcffe78e927b Mon Sep 17 00:00:00 2001 From: Cutls Date: Wed, 27 Feb 2019 01:51:37 +0900 Subject: [PATCH] TheDesk Miria (17.0.1) --- app/js/lang/lang.en.js | 1 + app/js/lang/lang.ja.js | 1 + app/js/tl/parse.js | 5 +- app/js/ui/layout.js | 26 +- app/js/ui/settings.js | 14 +- app/main.js | 8 +- app/package-lock.json | 1598 ++++++++++++++---------- app/package.json | 4 +- app/view/en/index.html | 2 +- app/view/en/setting.html | 6 +- app/view/en/update.html | 69 +- app/view/ja/index.html | 2 +- app/view/ja/setting.html | 6 +- app/view/ja/update.html | 69 +- app/view/make/index.sample.html | 5 +- app/view/make/language/setting.en.json | 4 +- app/view/make/language/setting.ja.json | 2 + app/view/make/language/update.en.json | 2 +- app/view/make/language/update.ja.json | 2 +- app/view/make/setting.sample.html | 4 + app/view/make/update.sample.html | 69 +- app/view/ps/acct.html | 4 +- app/view/ps/index.html | 6 +- app/view/ps/setting.html | 10 +- app/view/ps/update.html | 73 +- package-lock.json | 3 + 26 files changed, 1237 insertions(+), 758 deletions(-) create mode 100644 package-lock.json diff --git a/app/js/lang/lang.en.js b/app/js/lang/lang.en.js index a4b42979..11b94b06 100644 --- a/app/js/lang/lang.en.js +++ b/app/js/lang/lang.en.js @@ -202,6 +202,7 @@ var lang={ "lang_setting_selt":"Auto fold:{{set1}} lines and above, {{set2}} letters and above", "lang_setting_autocw":"Auto CW:{{set1}} lines and above, {{set2}} letters and above", "lang_setting_width":"Minimam width:{{set}}", + "lang_setting_fixwidth":"TweetDeck fixed width:{{set}}px", "lang_setting_img":"After posting an image:{{set}}", "lang_setting_font":"Fonts:{{set}}", "lang_setting_default":"default font", diff --git a/app/js/lang/lang.ja.js b/app/js/lang/lang.ja.js index c7f61c74..cbc5bf7f 100644 --- a/app/js/lang/lang.ja.js +++ b/app/js/lang/lang.ja.js @@ -203,6 +203,7 @@ var lang={ "lang_setting_selt":"{{set1}}行以上または{{set2}}文字以上でテキストを隠します。", "lang_setting_autocw":"{{set1}}行以上または{{set2}}文字以上で警告を表示します。", "lang_setting_width":"横幅最低を{{set}}pxに設定しました。", + "lang_setting_fixwidth":"TweetDeckの横幅を{{set}}pxに設定しました。", "lang_setting_img":"画像投稿後の設定を「{{set}}」に設定しました。", "lang_setting_font":"フォントを{{set}}に設定しました。", "lang_setting_default":"デフォルト", diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index b42d4c9f..bed84598 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -635,7 +635,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) { //Ticker var tickerdom=""; if(ticker){ - var tickerdata=JSON.parse(localStorage.getItem("ticker")); + var tickerdata=localStorage.getItem("ticker") + if(tickerdata){ + var tickerdata=JSON.parse(tickerdata); var thisdomain=toot.account.acct.split("@"); if(thisdomain.length>1){ @@ -649,6 +651,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) { } } } + } templete = templete + '
'+ ' '+ @@ -127,8 +137,8 @@ function parseColumn() { }else{ var exclude=""; } - var html = '