Fix share buttons

Victor Costa
1 parent 2c192b31
Showing 3 changed files with 18 additions and 11 deletions Show diff stats
index.html
js/handlebars-helpers.js
js/main.js
@@ -297,7 +297,7 @@
       </div>
       <div class="social">
         <span>Compartilhe esta proposta</span>
-        {{#social_share parent.title abstract "#/programas/{{parent.id}}/propostas/{{id}}"}}{{/social_share}}
+        {{{social_share parent.title abstract (proposal_url parent.id id)}}}
       </div>
     </script>
@@ -384,10 +384,10 @@
     <script id="social-share" type="text/x-handlebars-template">
       <ul>
-        <li><a href="#/programas/{{parent.id}}/propostas/{{id}}" class="fb-share icon icon-facebook" data-caption="{{parent.title}}" data-description="{{stripTags abstract}}">Compartilhar no Facebook</a></li>
-        <li><a href="https://twitter.com/intent/tweet?text={{stripTags abstract}}" class="tw-share icon icon-twitter popup">Compartilhar no Twitter</a></li>
-        <li><a href="https://plus.google.com/share?url=http://dialoga.gov.br" class="gp-share icon icon-gplus popup">Compartilhar no Google Plus</a></li>
-        <li><a class="ws-share disabled icon icon-whatsapp">Compartilhar no WhatsApp</a></li>
+        <li><a href="{{url}}" class="fb-share icon icon-facebook" data-caption="{{title}}" data-description="{{stripTags description}}">Compartilhar no Facebook</a></li>
+        <li><a href="https://twitter.com/intent/tweet?url={{encodeURI url}}&text={{stripTags description}}" class="tw-share icon icon-twitter popup">Compartilhar no Twitter</a></li>
+        <li><a href="https://plus.google.com/share?url={{encodeURI url}}" class="gp-share icon icon-gplus popup">Compartilhar no Google Plus</a></li>
+        <li><a href="whatsapp://send" data-text="{{stripTags description}}" data-href="{{url}}" class="ws-share icon icon-whatsapp">Compartilhar no WhatsApp</a></li>
       </ul>
     </script>
@@ -96,7 +96,19 @@ define([&#39;handlebars&#39;], function(Handlebars){
   Handlebars.registerHelper('social_share', function(title, description, url) {
     var template = Handlebars.compile($('#social-share').html());
-    return template();
+    if(url==='#') {
+      url = '';
+    }
+    url = 'http:'+Url.addBaseUrl(url);
+    return template({title: title, description: description, url: url});
+  });
+
+  Handlebars.registerHelper('proposal_url', function(parent_id, id) {
+    return "#/programas/"+parent_id+"/propostas/"+id;
+  });
+
+  Handlebars.registerHelper('encodeURI', function(uri) {
+    return encodeURIComponent(uri);
   });
   function proposal_has_category(proposal, category_slug) {
@@ -675,11 +675,6 @@ define([&#39;handlebars&#39;, &#39;fastclick&#39;, &#39;handlebars_helpers&#39;], function(Handlebars, F
     $(document).on('click', '.social .fb-share', function(e) {
       var link = $(this).attr('href');
-      if(link==='#' || link ==='') {
-        link = window.location.href;
-      } else {
-        link = 'http:'+Url.addBaseUrl(link);
-      }
       FB.ui({
           method: 'feed',
           link: link,
	@@ -96,7 +96,19 @@ define(['handlebars'], function(Handlebars){		@@ -96,7 +96,19 @@ define(['handlebars'], function(Handlebars){
96		96
97	Handlebars.registerHelper('social_share', function(title, description, url) {	97	Handlebars.registerHelper('social_share', function(title, description, url) {
98	var template = Handlebars.compile($('#social-share').html());	98	var template = Handlebars.compile($('#social-share').html());
99	- return template();	99	+ if(url==='#') {
		100	+ url = '';
		101	+ }
		102	+ url = 'http:'+Url.addBaseUrl(url);
		103	+ return template({title: title, description: description, url: url});
		104	+ });
		105	+
		106	+ Handlebars.registerHelper('proposal_url', function(parent_id, id) {
		107	+ return "#/programas/"+parent_id+"/propostas/"+id;
		108	+ });
		109	+
		110	+ Handlebars.registerHelper('encodeURI', function(uri) {
		111	+ return encodeURIComponent(uri);
100	});	112	});
101		113
102	function proposal_has_category(proposal, category_slug) {	114	function proposal_has_category(proposal, category_slug) {