From 6ab4775f965b2b94d014eca5116f09c5bc1b1153 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Tue, 24 May 2016 15:19:11 -0500
Subject: [PATCH]  let join now link stay for duration of lesson

---
 .../javascripts/react-components/JamClassScreen.js.jsx.coffee   | 2 +-
 .../react-components/stores/LessonTimerStore.js.coffee          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee
index b6c9dd2ed..223e9e4e6 100644
--- a/web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee
@@ -521,7 +521,7 @@ LessonTimerActions = context.LessonTimerActions
           if lessonData.times.startingSoon
             timeStmt = `<span>Starts in {lessonData.times.until.minutes} minutes. <a
               onClick={this.joinLessonNow.bind(this, lessonData)}>join lesson now</a></span>`
-          else if lessonData.times.initialWindow
+          else if lessonData.times.inThePast
             minutes = -lessonData.times.until.minutes
 
             if minutes == 1 || minutes == 0
diff --git a/web/app/assets/javascripts/react-components/stores/LessonTimerStore.js.coffee b/web/app/assets/javascripts/react-components/stores/LessonTimerStore.js.coffee
index 19f3b9360..7a3985e0e 100644
--- a/web/app/assets/javascripts/react-components/stores/LessonTimerStore.js.coffee
+++ b/web/app/assets/javascripts/react-components/stores/LessonTimerStore.js.coffee
@@ -39,7 +39,7 @@ rest = new context.JK.Rest()
             # we are past the start time
           if untilInfo.total > -(10 * 60 * 1000) # 10 minutes
             initialWindow = true
-          else if untilInfo.total > -(15*60*1000) # 15 minute
+          else if untilInfo.total > -(lesson.duration*60*1000) # duration
             inThePast = true
         else
           # we are before the due time