From 4b0a1179e90bef79705ac93d9d8c44fad33a4aa9 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 19 Aug 2013 11:34:08 +1000
Subject: [PATCH] link to first unread as opposed to last read in topic lists

---
 .../discourse/helpers/application_helpers.js         |  2 +-
 app/assets/javascripts/discourse/models/topic.js     | 10 ++++++++--
 .../templates/featured_topics.js.handlebars          |  8 ++++----
 .../templates/list/basic_topic_list.js.handlebars    | 12 ++++++------
 .../templates/list/topic_list_item.js.handlebars     | 10 +++++-----
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js
index 34ee470db11..89a58dc9040 100644
--- a/app/assets/javascripts/discourse/helpers/application_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/application_helpers.js
@@ -32,7 +32,7 @@ Handlebars.registerHelper('topicLink', function(property, options) {
   var title, topic;
   topic = Ember.Handlebars.get(this, property, options);
   title = topic.get('fancy_title') || topic.get('title');
-  return "<a href='" + (topic.get('lastReadUrl')) + "' class='title'>" + title + "</a>";
+  return "<a href='" + (topic.get('lastUnreadUrl')) + "' class='title'>" + title + "</a>";
 });
 
 /**
diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index e6c1686c8d0..af80f678cd5 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -78,6 +78,11 @@ Discourse.Topic = Discourse.Model.extend({
     return this.urlForPostNumber(this.get('last_read_post_number'));
   }.property('url', 'last_read_post_number'),
 
+  lastUnreadUrl: function() {
+    var postNumber = Math.min(this.get('last_read_post_number') + 1, this.get('highest_post_number'));
+    return this.urlForPostNumber(postNumber);
+  }.property('url', 'last_read_post_number', 'highest_post_number'),
+
   lastPostUrl: function() {
     return this.urlForPostNumber(this.get('highest_post_number'));
   }.property('url', 'highest_post_number'),
@@ -86,8 +91,9 @@ Discourse.Topic = Discourse.Model.extend({
   // tells us if we are still asynchronously flushing our "recently read" data.
   // So take what the browser has seen into consideration.
   displayNewPosts: function() {
-    var delta, highestSeen, result;
-    if (highestSeen = Discourse.Session.currentProp('highestSeenByTopic')[this.get('id')]) {
+    var delta, result;
+    var highestSeen = Discourse.Session.currentProp('highestSeenByTopic')[this.get('id')];
+    if (highestSeen) {
       delta = highestSeen - this.get('last_read_post_number');
       if (delta > 0) {
         result = this.get('new_posts') - delta;
diff --git a/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars b/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
index f8b34f1399b..36d5c13fe5b 100644
--- a/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/featured_topics.js.handlebars
@@ -29,20 +29,20 @@
           {{{topicLink this}}}
 
           {{#if unread}}
-            <a href="{{unbound lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound unread}}</a>
+            <a href="{{unbound lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound unread}}</a>
           {{/if}}
           {{#if new_posts}}
-            <a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound new_posts}}</a>
+            <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound new_posts}}</a>
           {{/if}}
           {{#if unseen}}
-            <a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
+            <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
           {{/if}}
 
           {{#if hasExcerpt}}
             <div class="topic-excerpt">
               {{{excerpt}}}
               {{#if excerptTruncated}}
-                {{#unless canClearPin}}<a href="{{lastReadUrl}}">{{i18n read_more}}</a>{{/unless}}
+                {{#unless canClearPin}}<a href="{{lastUnreadUrl}}">{{i18n read_more}}</a>{{/unless}}
               {{/if}}
               {{#if canClearPin}}
                 <a href="#" {{action clearPin this}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
diff --git a/app/assets/javascripts/discourse/templates/list/basic_topic_list.js.handlebars b/app/assets/javascripts/discourse/templates/list/basic_topic_list.js.handlebars
index 9672cffa5a8..5dd68fbe3f4 100644
--- a/app/assets/javascripts/discourse/templates/list/basic_topic_list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/basic_topic_list.js.handlebars
@@ -13,21 +13,21 @@
   {{#groupedEach view.topics}}
     <tr>
       <td class='main-link'>
-        <a class='title' href="{{unbound lastReadUrl}}">{{{unbound fancy_title}}}</a>
+        <a class='title' href="{{unbound lastUnreadUrl}}">{{{unbound fancy_title}}}</a>
         {{#if unread}}
-          <a href="{{unbound lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound unread}}</a>
+          <a href="{{unbound lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unbound unread}}</a>
         {{/if}}
         {{#if new_posts}}
-          <a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound new_posts}}</a>
+          <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="new_posts"}}'>{{unbound new_posts}}</a>
         {{/if}}
         {{#if unseen}}
-          <a href="{{unbound lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
+          <a href="{{unbound lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
         {{/if}}
       </td>
       <td class='category'>
         {{categoryLink category}}
       </td>
-      <td class='num posts'><a href="{{unbound lastReadUrl}}" class='badge-posts'>{{number posts_count numberKey="posts_long"}}</a></td>
+      <td class='num posts'><a href="{{unbound lastUnreadUrl}}" class='badge-posts'>{{number posts_count numberKey="posts_long"}}</a></td>
 
       <td class='num likes'>
         {{#if like_count}}
@@ -52,4 +52,4 @@
     </tr>
   {{/groupedEach}}
 
-</table>
\ No newline at end of file
+</table>
diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
index ccf18fcb2ed..81d25ea5e7a 100644
--- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
@@ -19,20 +19,20 @@
   {{topicStatus topic=this}}
   {{{topicLink this}}}
   {{#if unread}}
-    <a href="{{lastReadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
+    <a href="{{lastUnreadUrl}}" class='badge unread badge-notification' title='{{i18n topic.unread_posts count="unread"}}'>{{unread}}</a>
   {{/if}}
   {{#if displayNewPosts}}
-    <a href="{{lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="displayNewPosts"}}'>{{displayNewPosts}}</a>
+    <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new_posts count="displayNewPosts"}}'>{{displayNewPosts}}</a>
   {{/if}}
   {{#if unseen}}
-    <a href="{{lastReadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
+    <a href="{{lastUnreadUrl}}" class='badge new-posts badge-notification' title='{{i18n topic.new}}'><i class='icon icon-asterisk'></i></a>
   {{/if}}
 
   {{#if hasExcerpt}}
     <div class="topic-excerpt">
       {{excerpt}}
       {{#if excerptTruncated}}
-        {{#unless canClearPin}}<a href="{{lastReadUrl}}">{{i18n read_more}}</a>{{/unless}}
+        {{#unless canClearPin}}<a href="{{lastUnreadUrl}}">{{i18n read_more}}</a>{{/unless}}
       {{/if}}
       {{#if canClearPin}}
         <a href="#" {{action clearPin this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
@@ -51,7 +51,7 @@
   {{/each}}
 </td>
 
-<td class='num posts'><a href="{{lastReadUrl}}" class='badge-posts'>{{number posts_count numberKey="posts_long"}}</a></td>
+<td class='num posts'><a href="{{lastUnreadUrl}}" class='badge-posts'>{{number posts_count numberKey="posts_long"}}</a></td>
 
 <td class='num likes'>
   {{#if like_count}}