From 35a9051f5657e46ebecc0dd91b97b3a9a3e11815 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 22 Mar 2013 20:18:10 -0700
Subject: [PATCH] cleanup

---
 .../javascripts/discourse/mixins/scrolling.js |  2 --
 .../javascripts/discourse/views/topic_view.js | 22 +++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js b/app/assets/javascripts/discourse/mixins/scrolling.js
index 34d1b3b24..bf731909d 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js
@@ -29,8 +29,6 @@ Discourse.Scrolling = Em.Mixin.create({
 
     $(document).bind('touchmove.discourse', onScroll);
     $(window).bind('scroll.discourse', onScroll);
-
-    // resize is should also fire this cause it causes scrolling of sorts
   },
 
   /**
diff --git a/app/assets/javascripts/discourse/views/topic_view.js b/app/assets/javascripts/discourse/views/topic_view.js
index f8e6cd4e2..2fc112095 100644
--- a/app/assets/javascripts/discourse/views/topic_view.js
+++ b/app/assets/javascripts/discourse/views/topic_view.js
@@ -123,7 +123,7 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
   didInsertElement: function(e) {
     var topicView = this;
     this.bindScrolling({debounce: 0});
-    $(window).bind('resize.discourse-on-scroll', function() { scrolled(false); });
+    $(window).bind('resize.discourse-on-scroll', function() { topicView.updatePosition(false); });
 
     var controller = this.get('controller');
     controller.subscribe();
@@ -140,14 +140,12 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
       return Discourse.ClickTrack.trackClick(e);
     });
 
-    this.scrolled();
+    this.updatePosition(true);
   },
 
   // Triggered whenever any posts are rendered, debounced to save over calling
   postsRendered: Discourse.debounce(function() {
-    var $window = $(window);
-    var $lastPost = $('.row:last');
-    this.scrolled(false);
+    this.updatePosition(false);
   }, 50),
 
   resetRead: function(e) {
@@ -345,21 +343,26 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
   },
 
   updateDock: function(postView) {
+    var post;
     if (!postView) return;
     post = postView.get('post');
     if (!post) return;
     this.set('progressPosition', post.get('post_number'));
   },
 
-  nonUrgentScrolled: Discourse.debounce(function(opts){
+  nonUrgentPositionUpdate: Discourse.debounce(function(opts){
       var screenTrack = this.get('screenTrack');
-      if(opts.track && screenTrack) {
+      if(opts.userActive && screenTrack) {
         screenTrack.scrolled();
       }
       this.set('controller.currentPost', opts.currentPost);
   },500),
 
-  scrolled: function(track) {
+  scrolled: function(){
+    this.updatePosition(true);
+  },
+
+  updatePosition: function(userActive) {
     var $lastPost, firstLoaded, lastPostOffset, offset, 
         title, info, rows, screenTrack, _this, currentPost;
 
@@ -387,7 +390,7 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
       currentPost = currentPost || seen;
     });
 
-    this.nonUrgentScrolled({track: track!==false, currentPost: currentPost});
+    this.nonUrgentPositionUpdate({userActive: userActive, currentPost: currentPost});
     
     offset = window.pageYOffset || $('html').scrollTop();
     firstLoaded = this.get('firstPostLoaded');
@@ -425,6 +428,7 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
 
   browseMoreMessage: (function() {
     var category, opts;
+
     opts = {
       popularLink: "<a href=\"/\">" + (Em.String.i18n("topic.view_popular_topics")) + "</a>"
     };