Merge pull request fossar#359 from bbeardsley/only_anonymize_open

pass original url to everything except for opening the url

Author: SSilence

public/css/style.css

@@ -466,6 +466,10 @@ input {
         text-decoration:none;
     }
 
+    .entry-link {
+        display:none;
+    }
+
     .entry-source,
     .entry-separator,
     .entry-datetime {

public/js/selfoss-events-entriestoolbar.js

@@ -28,35 +28,35 @@ selfoss.events.entriesToolbar = function(parent) {
 
     // share with google plus
     parent.find('.entry-sharegoogle').unbind('click').click(function(e) {
-        window.open("https://plus.google.com/share?url="+encodeURIComponent($(this).parents(".entry").children("a").eq(0).attr("href")));
+        window.open("https://plus.google.com/share?url="+encodeURIComponent($(this).parents(".entry").children(".entry-link").eq(0).attr("href")));
         e.preventDefault();
         return false;
     });
 
     // share with twitter
     parent.find('.entry-sharetwitter').unbind('click').click(function(e) {
-        window.open("https://twitter.com/intent/tweet?source=webclient&text="+encodeURIComponent($(this).parents(".entry").children(".entry-title").html())+" "+encodeURIComponent($(this).parents(".entry").children("a").eq(0).attr("href")));
+        window.open("https://twitter.com/intent/tweet?source=webclient&text="+encodeURIComponent($(this).parents(".entry").children(".entry-title").html())+" "+encodeURIComponent($(this).parents(".entry").children(".entry-link").eq(0).attr("href")));
         e.preventDefault();
         return false;
     });
 
     // share with facebook
     parent.find('.entry-sharefacebook').unbind('click').click(function(e) {
-        window.open("https://www.facebook.com/sharer/sharer.php?u="+encodeURIComponent($(this).parents(".entry").children("a").eq(0).attr("href"))+"&t="+encodeURIComponent($(this).parents(".entry").children(".entry-title").html()));
+        window.open("https://www.facebook.com/sharer/sharer.php?u="+encodeURIComponent($(this).parents(".entry").children(".entry-link").eq(0).attr("href"))+"&t="+encodeURIComponent($(this).parents(".entry").children(".entry-title").html()));
         e.preventDefault();
         return false;
     });
 
     // share with pocket
     parent.find('.entry-sharepocket').unbind('click').click(function(e) {
-        window.open(" https://getpocket.com/save?url="+encodeURIComponent($(this).parents(".entry").children("a").eq(0).attr("href"))+"&title="+encodeURIComponent($(this).parents(".entry").children(".entry-title").html()));
+        window.open(" https://getpocket.com/save?url="+encodeURIComponent($(this).parents(".entry").children(".entry-link").eq(0).attr("href"))+"&title="+encodeURIComponent($(this).parents(".entry").children(".entry-title").html()));
         e.preventDefault();
         return false;
     });
 
     // share with delicious
     parent.find('.entry-sharedelicious').unbind('click').click(function(e) {
-        var href = $(this).parents(".entry").children("a").eq(0).attr("href");
+        var href = $(this).parents(".entry").children(".entry-link").eq(0).attr("href");
         var title = $(this).parents(".entry").children(".entry-title").html();
         window.open("https://delicious.com/save?url="+encodeURIComponent(href)+"&title="+encodeURIComponent(title));
         e.preventDefault();
@@ -65,14 +65,14 @@ selfoss.events.entriesToolbar = function(parent) {
 
     // share with readability
     parent.find('.entry-sharereadability').unbind('click').click(function(e) {
-        window.open(" http://www.readability.com/save?url="+encodeURIComponent($(this).parents(".entry").children("a").eq(0).attr("href")));
+        window.open(" http://www.readability.com/save?url="+encodeURIComponent($(this).parents(".entry").children(".entry-link").eq(0).attr("href")));
         e.preventDefault();
         return false;
     });
 
     // share with e-mail
     parent.find('.entry-shareemail').unbind('click').click(function(e) {
-        document.location.href = "mailto:?body="+encodeURIComponent($(this).parents(".entry").children("a").eq(0).attr("href"))+"&subject="+encodeURIComponent($(this).parents(".entry").children(".entry-title").html());
+        document.location.href = "mailto:?body="+encodeURIComponent($(this).parents(".entry").children(".entry-link").eq(0).attr("href"))+"&subject="+encodeURIComponent($(this).parents(".entry").children(".entry-title").html());
         e.preventDefault();
         return false;
     });

templates/item.phtml

@@ -35,6 +35,7 @@
 
     <!-- source -->
     <a href="<?PHP echo trim(\F3::get('anonymizer')) . $this->item['link']; ?>" class="entry-source entry-source<?PHP echo $this->item['source']; ?>" target="_blank"><?PHP echo $sourcetitle ?></a>
+    <a href="<?PHP echo $this->item['link']; ?>" class="entry-link"></a>
 
     <span class="entry-separator">&bull;</span>