Browse Source

Merge branch 'feature_disable_reply_counts' into cybrespace

Andrew 3 months ago
parent
commit
f64962e687

+ 1
- 1
app/javascript/mastodon/components/status_action_bar.js View File

@@ -204,7 +204,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
204 204
 
205 205
     return (
206 206
       <div className='status__action-bar'>
207
-        <div className='status__action-bar__counter'><IconButton className='status__action-bar-button' disabled={anonymousAccess} title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} /><span className='status__action-bar__counter__label' >{obfuscatedCount(status.get('replies_count'))}</span></div>
207
+        <div className='status__action-bar__counter'><IconButton className='status__action-bar-button' disabled={anonymousAccess} title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} /></div>
208 208
         <IconButton className='status__action-bar-button' disabled={anonymousAccess || !publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
209 209
         <IconButton className='status__action-bar-button star-icon' disabled={anonymousAccess} animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='floppy-o' onClick={this.handleFavouriteClick} />
210 210
         {shareButton}

+ 0
- 1
app/views/stream_entries/_simple_status.html.haml View File

@@ -35,7 +35,6 @@
35 35
     .status__action-bar__counter
36 36
       = link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
37 37
         = fa_icon 'reply fw'
38
-      .status__action-bar__counter__label= obscured_counter status.replies_count
39 38
     = link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
40 39
       - if status.public_visibility? || status.unlisted_visibility?
41 40
         = fa_icon 'retweet fw'