deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

reload study video and better handle invalid URLs

Browse source
This commit is contained in:
Thibault Duplessis 2017-08-19 18:26:19 -05:00
parent ae689824ce
commit 6492f9e35b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/study/src/main/StudyApi.scala
View file

@ -479,7 +479,8 @@ final class StudyApi(
val shouldReload =
(newChapter.setup.orientation != chapter.setup.orientation) ||
(newChapter.practice != chapter.practice) ||
(newChapter.gamebook != chapter.gamebook)
(newChapter.gamebook != chapter.gamebook) ||
(newChapter.embed != chapter.embed)
if (study.position.chapterId == chapter.id && shouldReload)
sendTo(study, Socket.ChangeChapter(uid, study.position))
else

5
ui/analyse/src/study/studyView.ts
View file

@ -141,7 +141,10 @@ export function main(ctrl: StudyCtrl): VNode {
return embedUrl ? h('div', [
sideBox,
h('div.side_box.embed', {
hook: innerHTML(embedUrl, t => toYouTubeEmbed(t, 140)!)
hook: innerHTML(embedUrl, t => {
const html = toYouTubeEmbed(t, 140);
return html || (ctrl.members.canContribute() ? 'Invalid YouTube URL' : '')
})
})
]) : sideBox;
}