From 626aebef4d1f27b0d7f4141a235daaed9dc620ee Mon Sep 17 00:00:00 2001 From: cutls Date: Sat, 14 Dec 2019 23:41:35 +0900 Subject: [PATCH] TheDesk 20.1.0 (Kawaii) --- app/css/tl.css | 5 +++- app/js/post/status.js | 14 +++++------ app/js/tl/parse.js | 4 +-- app/package.json | 2 +- app/view/make/index.sample.html | 43 ++++++++++++++++++++++++++++++--- app/view/make/make.js | 2 +- 6 files changed, 54 insertions(+), 16 deletions(-) diff --git a/app/css/tl.css b/app/css/tl.css index eda1a603..c7442bcf 100644 --- a/app/css/tl.css +++ b/app/css/tl.css @@ -224,7 +224,10 @@ iframe, margin: -1px 0; } .bigemoji { - width: 60px !important; + width: 100px !important; + height: auto !important; + position: relative; + z-index: 9999; } .faicon_FTL { display: none; diff --git a/app/js/post/status.js b/app/js/post/status.js index f40e6e85..56ed2605 100644 --- a/app/js/post/status.js +++ b/app/js/post/status.js @@ -57,7 +57,7 @@ function fav(id, acct_id, remote) { //ブースト function rt(id, acct_id, remote, vis) { - if ($(`.cvo[unique-id=${id}]`).hasClass('rted')) { + if ($(`.cvo[toot-id=${id}]`).hasClass('rted')) { var flag = 'unreblog' } else { var flag = 'reblog' @@ -85,7 +85,7 @@ function rt(id, acct_id, remote, vis) { json = json.reblog } console.log(['Success: boost', json]) - $('[unique-id=' + id + '] .fav_ct').text(json.favourites_count) + $('[toot-id=' + id + '] .fav_ct').text(json.favourites_count) if (!json.reblog) { if (flag == 'unreblog') { var rt = json.reblogs_count - 1 @@ -95,16 +95,16 @@ function rt(id, acct_id, remote, vis) { } else { var rt = json.reblogs_count } - $('[unique-id=' + id + '] .rt_ct').text(rt) + $('[toot-id=' + id + '] .rt_ct').text(rt) } else { - $('[unique-id=' + id + '] .rt_ct').text(json.reblogs_count) + $('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count) } - if ($('[unique-id=' + id + ']').hasClass('rted')) { - $('[unique-id=' + id + ']').removeClass('rted') + if ($('[toot-id=' + id + ']').hasClass('rted')) { + $('[toot-id=' + id + ']').removeClass('rted') $('.rt_' + id).removeClass('light-blue-text') } else { - $('[unique-id=' + id + ']').addClass('rted') + $('[toot-id=' + id + ']').addClass('rted') $('.rt_' + id).addClass('light-blue-text') } } diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js index 511d7b89..e78fb055 100644 --- a/app/js/tl/parse.js +++ b/app/js/tl/parse.js @@ -1060,9 +1060,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
- - + ${toot.reblogs_count}
diff --git a/app/package.json b/app/package.json index bf5d3e9d..484fd2b6 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "20.0.6", + "version": "20.1.0", "description": "TheDesk is a Mastodon client for PC.", "repository": "https://github.com/cutls/TheDesk", "main": "main.js", diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html index ff9c3f6b..1a604f7f 100644 --- a/app/view/make/index.sample.html +++ b/app/view/make/index.sample.html @@ -764,19 +764,54 @@ HP
GitHub

-