remove the 'avatar' helper and make 'avatarUrl' a global helper

Rayman · Jul 13, 2014 · b5c8426 · b5c8426
1 parent c4b86e7
commit b5c8426
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/client/lib/globalhelpers.js b/client/lib/globalhelpers.js
@@ -31,18 +31,13 @@ Handlebars.registerHelper('username', function(user){
   }
 });
 
-//avatar as responsive image
-Handlebars.registerHelper('avatar', function(id){
-  if(Meteor.users.findOne(id) == null) { return; }
-  var avatar = Meteor.users.findOne(id).profile.avatar;
-  var url="/img/avatar.jpg"
-  if (avatar) {
-    var url=avatar;
+Template.userProfile.avatarUrl = function() {
+  if(this.profile.avatar) {
+    return this.profile.avatar;
+  } else {
+    return "/img/avatar.jpg";
   }
-  return '<img class="img-circle img-responsive avatar" src="'+url+'">';
-});
-
-
+};
 
 Handlebars.registerHelper('currentRoute', function() {
 	var currentRoute = Router.current();

diff --git a/client/views/userProfile.html b/client/views/userProfile.html
@@ -2,7 +2,7 @@
 <div class="row">
   <div class="col-md-4">
     <div class="col-md-6">
-      {{{avatar _id}}}
+      <img class="img-circle img-responsive avatar" src="{{avatarUrl profile.avatar}}">
     </div>
     {{#if isOwner}}
       <div class="col-md-12">

diff --git a/client/views/userProfile.js b/client/views/userProfile.js
@@ -11,14 +11,6 @@ Template.userProfile.userFriends = function() {
   return Meteor.users.find({_id: {$in: friends}});
 };
 
-Template.userProfile.avatarUrl = function() {
-  if(this.profile.avatar) {
-    return this.profile.avatar;
-  } else {
-    return "/img/avatar.jpg";
-  }
-};
-
 Template.userProfile.events = {
   'click [data-action="set-username"]': function() {
     var newname = $("input#new-username").val();