seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

let join now link stay for duration of lesson

This commit is contained in:
Seth Call 2016-05-24 15:19:11 -05:00
parent 61314002b2
commit 6ab4775f96
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/react-components/JamClassScreen.js.jsx.coffee
View File

@ -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

2
web/app/assets/javascripts/react-components/stores/LessonTimerStore.js.coffee
View File

@ -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