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

* fix webcam_viewer init problem

This commit is contained in:
Seth Call 2015-07-01 18:19:32 -05:00
parent 512e89074b
commit 3130ab31a2
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/app/assets/javascripts/application.js
View File

@ -59,6 +59,7 @@
//= require web/signin_helper
//= require web/signin
//= require web/tracking
//= require webcam_viewer
//= require react-components
//= require_directory .
//= require_directory ./dialog

2
web/app/assets/javascripts/dialog/recordingFinishedDialog.js
View File

@ -57,7 +57,7 @@
});
}
else if (localResult.aggregate_state == 'PARTIALLY_MISSING') {
logger.error("unable to open recording due to some missing tracks: %o", localResults);
logger.error("unable to open recording due to some missing tracks: %o", recording, localResults);
app.notify({
title: "Unable to Open Recording for Playback",
text: "Some of your tracks associated with the recording are missing. This is a bug in the application.",

1
web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee
View File

@ -44,6 +44,7 @@ NotificationActions = @NotificationActions
this.listenTo(context.RecordingStore, this.onRecordingChanged)
if gon.global.video_available && gon.global.video_available!="none"
@webcamViewer = new context.JK.WebcamViewer()
@webcamViewer.init()
@webcamViewer.setVideoOff()