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

* VRFS-2406 prevent export while in session

This commit is contained in:
Seth Call 2014-10-27 17:21:52 -05:00
parent fb36b8e380
commit e26f870e18
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/recording_utils.js.coffee
View File

@ -34,7 +34,7 @@ class RecordingUtils
mixStateDefinition: (mixState) =>
definition = switch mixState
when 'still-uploading' then "STILL UPLOADING means the you or others in the recording have not uploaded enough information yet to make a mix."
when 'still-uploading' then "STILL UPLOADING means you or others in the recording have not uploaded enough information yet to make a mix."
when 'stream-mix' then "STREAM MIX means a user's real-time mix is available to listen to."
when 'discarded' then "DISCARDED means you chose to not keep this recording when the recording was over."
when 'mixed' then "MIXED means all tracks have been uploaded, and a final mix has been made."

6
web/app/assets/javascripts/sync_viewer.js.coffee
View File

@ -401,7 +401,7 @@ context.JK.SyncViewer = class SyncViewer
summary = "Both you and the JamKazam server have the high-quality version of this track. Once all the other tracks for this recording are also synchronized, then the final mix can be made."
clientStateDefinition = switch clientState
when @clientStates.too_many_downloads then "This track has been downloaded a unusually large number of times. No more downloads are allowed."
when @clientStates.too_many_downloads then "This track has been downloaded an unusually large number of times. No more downloads are allowed."
when @clientStates.hq then "HIGHEST QUALITY means you have the original version of this track, as recorded by the user that made it."
when @clientStates.sq then "STREAM QUALITY means you have the version of the track that you received over the internet in real-time."
when @clientStates.missing then "MISSING means you do not have this track anymore."
@ -529,6 +529,10 @@ context.JK.SyncViewer = class SyncViewer
exportRecording: (e) =>
$export = $(e.target)
if context.JK.CurrentSessionModel and context.JK.CurrentSessionModel.inSession()
context.JK.confirmBubble($export, 'sync-viewer-paused', {}, {offsetParent: $export.closest('.dialog')})
return
recordingId = $export.closest('.details').attr('data-recording-id')
if !recordingId? or recordingId == ""
throw "exportRecording can't find data-recording-id"

2
web/app/views/clients/_help.html.erb
View File

@ -129,7 +129,7 @@
<script type="text/template" id="template-help-sync-viewer-paused">
<div class="help-sync-viewer-paused">
JamKazam prevents file uploads and downloads while in a session.
JamKazam prevents file uploads, downloads, and recording exports while in a session.
</div>
</script>