Merge pull request #389 from indeyets/omitted

fix for count of omitted likes
pepyatka · May 19, 2015 · 615e60a · 615e60a
2 parents 8af0c41 + 2576384
commit 615e60a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/public/js/app/controllers/PostGenericController.js b/public/js/app/controllers/PostGenericController.js
@@ -22,7 +22,7 @@ define(["config",
       return this.get('model.likes').isAny('id', this.get('session.currentUser.id'))
     }.property('model.likes', 'session.currentUser.id'),
 
-    isOmittedComments: function() {
+    hasOmittedComments: function() {
       return this.get('model.omittedComments') > 0
     }.property('model.omittedComments'),
 
@@ -31,7 +31,7 @@ define(["config",
         return this.get('model.omittedComments') + this.get('model.comments.length') - 2
     }.property('model.omittedComments', 'model.comments.length'),
 
-    isOmittedLikes: function() {
+    hasOmittedLikes: function() {
       return this.get('maxLikes') != 'all' &&
         (this.get('model.omittedLikes') != 0 ||
          this.get('model.likes.length') > 4)

diff --git a/public/js/app/templates/postLikesTemplate.handlebars b/public/js/app/templates/postLikesTemplate.handlebars
@@ -1,7 +1,7 @@
 <div class="likes">
   <i class="fa fa-heart icon"></i>
 
-  {{#if controller.isOmittedLikes}}
+  {{#if controller.hasOmittedLikes}}
     <ul class="p-timeline-user-likes">
       {{#each controller.firstLikes as |user index|}}
         <li class="p-timeline-user-like">

diff --git a/public/js/app/templates/timelinePostTemplate.handlebars b/public/js/app/templates/timelinePostTemplate.handlebars
@@ -76,7 +76,7 @@
     </div>
 
     <div class="comments">
-      {{#if controller.isOmittedComments}}
+      {{#if controller.hasOmittedComments}}
         {{#each comment in controller.firstComments itemController="post-comment"}}
           {{view "post-comment" content=comment}}
         {{/each}}