From 3130ab31a2376a8d9ecf2a4f751a2c3bc6dcec00 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 1 Jul 2015 18:19:32 -0500 Subject: [PATCH] * fix webcam_viewer init problem --- web/app/assets/javascripts/application.js | 1 + web/app/assets/javascripts/dialog/recordingFinishedDialog.js | 2 +- .../javascripts/react-components/stores/SessionStore.js.coffee | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/app/assets/javascripts/application.js b/web/app/assets/javascripts/application.js index ea252201f..811277c13 100644 --- a/web/app/assets/javascripts/application.js +++ b/web/app/assets/javascripts/application.js @@ -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 diff --git a/web/app/assets/javascripts/dialog/recordingFinishedDialog.js b/web/app/assets/javascripts/dialog/recordingFinishedDialog.js index 6152927a2..cceaaedc2 100644 --- a/web/app/assets/javascripts/dialog/recordingFinishedDialog.js +++ b/web/app/assets/javascripts/dialog/recordingFinishedDialog.js @@ -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.", diff --git a/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee b/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee index 7c81247fd..e8c2422b9 100644 --- a/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/SessionStore.js.coffee @@ -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()