Goodbye FriendFeed !

Fixes YOURLS#1986
SeanZoR · Dec 4, 2015 · 38bb99f · 38bb99f
1 parent 542e24b
commit 38bb99f
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 8 deletions.
diff --git a/css/share.css b/css/share.css
@@ -52,7 +52,6 @@ div.share {
 }
 #share_tw {background:transparent url(../images/twitter.png) left center no-repeat;}
 #share_fb {background:transparent url(../images/facebook.png) left center no-repeat;}
-#share_ff {background:transparent url(../images/friendfeed.png) left center no-repeat;}
 
 #copylink{
 	cursor:pointer;

diff --git a/images/friendfeed.png b/images/friendfeed.png
diff --git a/includes/functions-html.php b/includes/functions-html.php
@@ -403,7 +403,6 @@ function yourls_share_box( $longurl, $shorturl, $title = '', $text='', $shortlin
 			<p id="share_links"><?php yourls_e( 'Share with' ); ?> 
 				<a id="share_tw" href="http://twitter.com/home?status=<?php echo $_share; ?>" title="<?php yourls_e( 'Tweet this!' ); ?>" onclick="share('tw');return false">Twitter</a>
 				<a id="share_fb" href="http://www.facebook.com/share.php?u=<?php echo $_url; ?>" title="<?php yourls_e( 'Share on Facebook' ); ?>" onclick="share('fb');return false;">Facebook</a>
-				<a id="share_ff" href="http://friendfeed.com/share/bookmarklet/frame#title=<?php echo $_share; ?>" title="<?php yourls_e( 'Share on Friendfeed' ); ?>" onclick="share('ff');return false;">FriendFeed</a>
 				<?php
 				yourls_do_action( 'share_links', $longurl, $shorturl, $title, $text );
 				// Note: on the main admin page, there are no parameters passed to the sharebox when it's drawn.

diff --git a/js/share.js b/js/share.js
@@ -10,10 +10,8 @@ function update_share() {
 	var text = encodeURIComponent( $('#tweet_body').val() );
 	var url = encodeURIComponent( $('#copylink').val() );
 	var tw = 'http://twitter.com/intent/tweet?status='+text;
-	var ff = 'http://friendfeed.com/share/bookmarklet/frame#title='+text ;
 	var fb = 'http://www.facebook.com/share.php?u='+url ;
 	$('#share_tw').attr('href', tw);
-	$('#share_ff').attr('href', ff);
 	$('#share_fb').attr('href', fb);
 
 	var charcount = parseInt(140 - $('#tweet_body').val().length);
@@ -25,10 +23,6 @@ function update_share() {
 function share(dest) {
 	var url = $('#share_'+dest).attr('href');
 	switch (dest) {
-	case 'ff':
-		//$('body').append('<script type="text/javascript" src="http://friendfeed.com/share/bookmarklet/javascript"></script>');
-		window.open(url, 'ff','toolbar=no,width=500,height=350');
-		break;
 	case 'fb':
 		//var url = $('#share_fb').attr('href');
 		window.open( url, 'fb','toolbar=no,width=1000,height=550');