From 83d12cd7bd08470419ab154a91f504d0be02a126 Mon Sep 17 00:00:00 2001
From: Miles Steele <msteele@edx.org>
Date: Tue, 6 Aug 2013 14:38:44 -0400
Subject: [PATCH 1/2] add scroll to top on vertical view change

---
 .../xmodule/js/src/sequence/display.coffee    | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
index 149a38e9ec..26246644ea 100644
--- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
@@ -132,34 +132,38 @@ class @Sequence
     else
       alert 'Sequence error! Cannot navigate to tab ' + new_position + 'in the current SequenceModule. Please contact the course staff.'
 
-  next: (event) =>
+  next: (event) => @_change_sequential 'seq_next', event
+  previous: (event) => @_change_sequential 'seq_prev', event
+
+  # `direction` can be 'seq_prev' or 'seq_next'
+  _change_sequential: (direction, event) =>
+    # silently abort if direction is invalid.
+    return unless direction in ['seq_prev', 'seq_next']
+
     event.preventDefault()
-    new_position = @position + 1
-    Logger.log "seq_next", old: @position, new: new_position, id: @id
+    offset =
+      seq_next: 1
+      seq_prev: -1
+    new_position = @position + offset[direction]
+    Logger.log direction,
+      old: @position
+      new: new_position
+      id: @id
 
     analytics.pageview @id
 
-    # navigation using the next arrow
-    analytics.track "Accessed Next Sequential",
-      sequence_id: @id
-      current_sequential: @position
-      target_sequential: new_position
-
-    @render new_position
-
-  previous: (event) =>
-    event.preventDefault()
-    new_position = @position - 1
-    Logger.log "seq_prev", old: @position, new: new_position, id: @id
-
-    analytics.pageview @id
-
-    # navigation using the previous arrow
-    analytics.track "Accessed Previous Sequential",
+    # navigation using the next or previous arrow button.
+    tracking_messages =
+      seq_prev: "Accessed Previous Sequential"
+      seq_next: "Accessed Next Sequential"
+    analytics.track tracking_messages[direction],
       sequence_id: @id
       current_sequential: @position
       target_sequential: new_position
 
+    # If the bottom nav is used, scroll to the top of the page on change.
+    if $(event.target).closest('nav[class="sequence-bottom"]').length > 0
+      $.scrollTo 0, 150
     @render new_position
 
   link_for: (position) ->

From 84322694cd269ac7c03e192a4c833accec3b0e87 Mon Sep 17 00:00:00 2001
From: Miles Steele <msteele@edx.org>
Date: Thu, 8 Aug 2013 11:42:29 -0400
Subject: [PATCH 2/2] add jasmine test for scroll to top

---
 .../xmodule/xmodule/js/spec/sequence/display_spec.coffee  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.coffee b/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.coffee
index 1944f7dc74..7d7b51c416 100644
--- a/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.coffee
@@ -134,6 +134,7 @@ xdescribe 'Sequence', ->
     beforeEach ->
       jasmine.stubRequests()
       @sequence = new Sequence '1', 'sequence_1', @items, 'sequence', 2
+      $.scrollTo 150
       $('.sequence-nav-buttons .next a').click()
 
     it 'log the next sequence event', ->
@@ -142,10 +143,14 @@ xdescribe 'Sequence', ->
     it 'call render on the next sequence', ->
       expect($('#seq_content').html()).toEqual 'Sample Problem'
 
+    it 'scrolls to the top of the page', ->
+      expect($('body').scrollTop()).toBe 0
+
   describe 'previous', ->
     beforeEach ->
       jasmine.stubRequests()
       @sequence = new Sequence '1', 'sequence_1', @items, 'sequence', 2
+      $.scrollTo 150
       $('.sequence-nav-buttons .prev a').click()
 
     it 'log the previous sequence event', ->
@@ -154,6 +159,9 @@ xdescribe 'Sequence', ->
     it 'call render on the previous sequence', ->
       expect($('#seq_content').html()).toEqual 'Video 1'
 
+    it 'scrolls to the top of the page', ->
+      expect($('body').scrollTop()).toBe 0
+
   describe 'link_for', ->
     it 'return a link for specific position', ->
       sequence = new Sequence '1', 'sequence_1', @items, 2