From 6749c9f6f3251820ee7f2c742965e2d1945c337c Mon Sep 17 00:00:00 2001 From: Jeremy Herve Date: Mon, 3 Jul 2023 16:24:15 +0200 Subject: [PATCH] Sharing: remove Reddit's official sharing button (#31666) --- .../changelog/update-reddit-official-button | 4 +++ .../modules/sharedaddy/admin-sharing.css | 11 ------- .../modules/sharedaddy/admin-sharing.js | 1 + .../sharedaddy/images/smart-reddit.png | Bin 1572 -> 0 bytes .../sharedaddy/images/smart-reddit@2x.png | Bin 2601 -> 0 bytes .../modules/sharedaddy/sharing-sources.php | 27 ++++-------------- .../jetpack/modules/sharedaddy/sharing.css | 7 ++--- 7 files changed, 13 insertions(+), 37 deletions(-) create mode 100644 projects/plugins/jetpack/changelog/update-reddit-official-button delete mode 100644 projects/plugins/jetpack/modules/sharedaddy/images/smart-reddit.png delete mode 100644 projects/plugins/jetpack/modules/sharedaddy/images/smart-reddit@2x.png diff --git a/projects/plugins/jetpack/changelog/update-reddit-official-button b/projects/plugins/jetpack/changelog/update-reddit-official-button new file mode 100644 index 0000000000000..18d9bcb93f44b --- /dev/null +++ b/projects/plugins/jetpack/changelog/update-reddit-official-button @@ -0,0 +1,4 @@ +Significance: patch +Type: bugfix + +Sharing: remove Reddit's Oofficial iFramed sharing button, it is no longer working. Use icon+text sharing button instead. diff --git a/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.css b/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.css index 4cdb8aa0c1a22..4c6107924c350 100644 --- a/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.css +++ b/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.css @@ -308,13 +308,6 @@ body.settings_page_sharing .advanced input[type=submit] { margin-top: 2px; } -.preview-reddit .option-smart-on { - background: url(images/smart-reddit.png) no-repeat top left; - background-size: 104px 21px; - width:104px; - height:21px; -} - .preview-facebook .option-smart-on { background: url(images/smart-like.png) no-repeat top left; background-size: 85px 20px; @@ -380,10 +373,6 @@ body.settings_page_sharing .advanced input[type=submit] { background-image: url(images/smart-digg@2x.png); } - .preview-reddit .option-smart-on { - background-image: url(images/smart-reddit@2x.png); - } - .preview-facebook .option-smart-on { background-image: url(images/smart-like@2x.png); } diff --git a/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.js b/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.js index baf6237e704b8..d7c1948772388 100644 --- a/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.js +++ b/projects/plugins/jetpack/modules/sharedaddy/admin-sharing.js @@ -168,6 +168,7 @@ ! $( this ).hasClass( 'preview-mastodon' ) && ! $( this ).hasClass( 'preview-nextdoor' ) && ! $( this ).hasClass( 'preview-print' ) && + ! $( this ).hasClass( 'preview-reddit' ) && ! $( this ).hasClass( 'preview-telegram' ) && ! $( this ).hasClass( 'preview-jetpack-whatsapp' ) && ! $( this ).hasClass( 'share-custom' ) && diff --git a/projects/plugins/jetpack/modules/sharedaddy/images/smart-reddit.png b/projects/plugins/jetpack/modules/sharedaddy/images/smart-reddit.png deleted file mode 100644 index 5afa0aa6c9c130a7d699ca2d3a9ef696fa96f3fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1572 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 zZTHo0j8+O#i-{button_style ) { - $this->smart = true; - } else { - $this->smart = false; - } - } - /** * Service name. * @@ -1368,11 +1352,12 @@ public function get_name() { * @return string */ public function get_display( $post ) { - if ( $this->smart ) { - return '
'; - } else { - return $this->get_link( $this->get_process_request_url( $post->ID ), _x( 'Reddit', 'share to', 'jetpack' ), __( 'Click to share on Reddit', 'jetpack' ), 'share=reddit' ); - } + return $this->get_link( + $this->get_process_request_url( $post->ID ), + _x( 'Reddit', 'share to', 'jetpack' ), + __( 'Click to share on Reddit', 'jetpack' ), + 'share=reddit' + ); } /** diff --git a/projects/plugins/jetpack/modules/sharedaddy/sharing.css b/projects/plugins/jetpack/modules/sharedaddy/sharing.css index 42df6faf5e011..77615cc0ca1d8 100644 --- a/projects/plugins/jetpack/modules/sharedaddy/sharing.css +++ b/projects/plugins/jetpack/modules/sharedaddy/sharing.css @@ -285,7 +285,8 @@ body .sd-content ul li.share-custom.no-icon a span { .sd-social-icon .sd-content ul li.share-reddit a:before, .sd-social-text .sd-content ul li.share-reddit a:before, .sd-content ul li.share-reddit div.option.option-smart-off a:before, -.sd-social-icon-text .sd-content li.share-reddit a:before { +.sd-social-icon-text .sd-content li.share-reddit a:before, +.sd-social-official .sd-content li.share-reddit a:before { content: '\f222'; } .sd-social-icon .sd-content ul li.share-tumblr a:before, @@ -453,10 +454,6 @@ body .sd-content ul li.share-custom.no-icon a span { /* Individual official buttons */ -.reddit_button iframe { - margin-top: 1px; -} - .pocket_button iframe, .pinterest_button, .twitter_button, .linkedin_button>span { margin: 0 !important; }