Merge pull request #162 from ryandv/scroll_up_on_hide_reviews

Scroll up on hide reviews
UWFlow · Apr 20, 2014 · e5461b9 · e5461b9
2 parents 7c714fe + 71001d8
commit e5461b9
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 25 deletions.
diff --git a/server/static/js/prof.js b/server/static/js/prof.js
@@ -135,36 +135,49 @@ function($, _, _s, bootstrap, jqSlide, RmcBackbone, ratings, util, review) {
       return Math.max(this.numReviews() - this.numShown);
     },
 
-    // TODO(mack): refactor this mess
     toggleExpand: function() {
+      if (!this.firstExpanded) {
+        this._loadReviews();
+      } else if (this.expanded) {
+        this._collapseReviews();
+      } else {
+        this._expandReviews();
+      }
+    },
 
-      var toggle = _.bind(function() {
-        if (this.expanded) {
-          this.$('.expanded-reviews').fancySlide('up');
-          this.$('.toggle-reviews')
-            .html('See ' + this.numHidden() + ' more ' +
-                util.pluralize(this.numHidden(), 'review') + ' &raquo;');
-        } else {
-          this.$('.expanded-reviews').fancySlide('down');
-          this.$('.toggle-reviews').html('&laquo; Hide reviews');
-        }
-        this.expanded = !this.expanded;
-      }, this);
+    _loadReviews: function() {
+      this.firstExpanded = true;
+      this.$('.toggle-reviews').text('Loading...');
+      window.setTimeout(_.bind(function() {
+        this.profReviewCollectionView.render(false);
 
-      if (!this.firstExpanded) {
-        this.firstExpanded = true;
-        this.$('.toggle-reviews').text('Loading...');
-        window.setTimeout(_.bind(function() {
-          this.profReviewCollectionView.render(false);
+        this.$('.review-post').slice(this.numShown)
+          .wrapAll('<div class="expanded-reviews hide-initial">');
+
+        this._expandReviews();
+      }, this), 100);
+    },
 
-          this.$('.review-post').slice(this.numShown)
-            .wrapAll('<div class="expanded-reviews hide-initial">');
+    _collapseReviews: function() {
+      var profCardTop = this.$('.expandable-prof').offset().top;
+      var navBarHeight = $("#site-nav").height();
+      var margin = 16;
 
-          toggle();
-        }, this), 100);
-      } else {
-        toggle();
-      }
+      $('html,body').animate({
+        scrollTop: profCardTop - navBarHeight - margin
+      }, 300);
+
+      this.$('.expanded-reviews').fancySlide('up');
+      this.$('.toggle-reviews')
+        .html('See ' + this.numHidden() + ' more ' +
+              util.pluralize(this.numHidden(), 'review') + ' &raquo;');
+      this.expanded = false;
+    },
+
+    _expandReviews: function() {
+      this.$('.expanded-reviews').fancySlide('down');
+      this.$('.toggle-reviews').html('&laquo; Hide reviews');
+      this.expanded = true;
     }
   });
 

diff --git a/server/templates/about_page.html b/server/templates/about_page.html
@@ -294,6 +294,15 @@ <h1>Contributors</h1>
         contributions
       </a>
     </li>
+    <li>
+      <a target="_blank" href="https://github.com/ryandv">
+        Ryan De Villa
+      </a> &mdash;
+      <a target="_blank"
+          href="https://github.com/UWFlow/rmc/commits/master?author=ryandv">
+        contributions
+      </a>
+    </li>
   </ul>
 
   <h1 class="sponsors-heading">Thank you sponsors</h1>