From 043a93dfd58e0abe7fb3170ccd7d2082cba04ae0 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 19 Dec 2014 15:26:05 -0500
Subject: [PATCH] FIX: Sharing buttons broke in 1.9 template upgrade

---
 app/assets/javascripts/discourse/templates/share.hbs     | 3 +--
 .../javascripts/discourse/templates/share_link.hbs       | 6 +++---
 app/assets/javascripts/discourse/views/share-link.js.es6 | 9 ---------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs
index 9a62f373df4..04b70f361fc 100644
--- a/app/assets/javascripts/discourse/templates/share.hbs
+++ b/app/assets/javascripts/discourse/templates/share.hbs
@@ -11,8 +11,7 @@
 </div>
 
 {{each s in shareLinks itemView='share-link'}}
-
 <div class='link'>
-  <a href='#' {{action "close"}} title='{{i18n 'share.close'}}'><i class="fa fa-times-circle"></i></a>
+  <a href {{action "close"}} title='{{i18n 'share.close'}}'><i class="fa fa-times-circle"></i></a>
 </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/share_link.hbs b/app/assets/javascripts/discourse/templates/share_link.hbs
index c10ee05981a..44b3c98c8fa 100644
--- a/app/assets/javascripts/discourse/templates/share_link.hbs
+++ b/app/assets/javascripts/discourse/templates/share_link.hbs
@@ -1,5 +1,5 @@
-{{#if openInPopup}}
-  <a href="#" {{action "sharePopup" target href}} {{bind-attr title="title"}}><i {{bind-attr class=":fa iconClass"}}></i></a>
+{{#if s.openInPopup}}
+  <a href {{action "sharePopup" s.target s.href}} {{bind-attr title="title"}}><i {{bind-attr class=":fa s.iconClass"}}></i></a>
 {{else}}
-  <a {{bind-attr href="href"}} {{bind-attr title="title"}} target="_blank"><i {{bind-attr class=":fa iconClass"}}></i></a>
+  <a {{bind-attr href="s.href"}} {{bind-attr title="s.title"}} target="_blank"><i {{bind-attr class=":fa s.iconClass"}}></i></a>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/views/share-link.js.es6 b/app/assets/javascripts/discourse/views/share-link.js.es6
index 3f399d601ca..bf516ccd8a2 100644
--- a/app/assets/javascripts/discourse/views/share-link.js.es6
+++ b/app/assets/javascripts/discourse/views/share-link.js.es6
@@ -1,12 +1,3 @@
-/**
-  This view handles rendering of a link to share something on a
-  third-party site.
-
-  @class ShareLinkView
-  @extends Discourse.View
-  @namespace Discourse
-  @module Discourse
-**/
 export default Ember.View.extend({
   templateName: 'share_link',
   tagName: 'div',