Merge pull request #73 from openstax/fix/scroll-and-tweaks

Fix/scroll and tweaks, and fix IE

Author: philschatz

src/concept-coach/index.cjsx

@@ -1,4 +1,5 @@
 _ = require 'lodash'
+$ = require 'jquery'
 EventEmitter2 = require 'eventemitter2'
 
 helpers = require '../helpers'
@@ -126,9 +127,9 @@ class ConceptCoachAPI extends EventEmitter2
 
   handleOpened: (eventData, scrollTo, body = document.body) ->
     scrollTo ?= _.partial(window.scrollTo, 0)
-    {top} = eventData.coach.el.getBoundingClientRect()
-    {scrollY} = window
-    top +=  scrollY
+    {top} = $(eventData.coach.el).offset()
+    scrollY = $(window).scrollTop()
+
     componentModel.update(
       scrollY: scrollY
       closeScroll: ->
@@ -143,9 +144,8 @@ class ConceptCoachAPI extends EventEmitter2
 
   handleResize: ->
     return unless componentModel.el? and @component?.isMounted()
-    {top} = componentModel.el.getBoundingClientRect()
-    {scrollY} = window
-    top += scrollY
+    {top} = $(componentModel.el).offset()
+
     window.scrollTo(0, top)
 
   handleError: (error) ->

src/course/item.cjsx

@@ -5,6 +5,7 @@ interpolate = require 'interpolate'
 _ = require 'underscore'
 
 navigation = require '../navigation/model'
+componentModel = require '../concept-coach/model'
 
 CourseItem = React.createClass
   displayName: 'CourseItem'
@@ -23,6 +24,7 @@ CourseItem = React.createClass
     routeData = navigation.getDataByView('task')
     link = "#{link}#{routeData.route}"
 
+    componentModel.update(scrollY: 0)
     close()
     navigator.emit('close.for.book', {collectionUUID: ecosystem_book_uuid, link})
 

src/task/title.cjsx

@@ -5,6 +5,7 @@ tasks = require './collection'
 navigation = require '../navigation/model'
 
 {ChapterSectionMixin} = require 'openstax-react-components'
+componentModel = require '../concept-coach/model'
 
 TaskTitle = React.createClass
   displayName: 'TaskTitle'
@@ -18,6 +19,7 @@ TaskTitle = React.createClass
     {close} = @context
     {link} = tasks.getModuleInfo(taskId, cnxUrl)
 
+    componentModel.update(scrollY: 0)
     close()
     navigation.channel.emit('close.for.book', {collectionUUID, moduleUUID, link})