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-2701 wip adding external recordings

This commit is contained in:
Brian Smith 2015-04-01 23:09:16 -04:00
parent 03f94480e7
commit 269519a394
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/app/assets/javascripts/site_validator.js.coffee
View File

@ -83,7 +83,7 @@ context.JK.SiteValidator = class SiteValidator
@fail_callback(@input_div)
@deferred_status_check = null
@logger.debug("site_status = "+@site_status)
@logger.debug("site_status = " + @site_status)
processSiteCheckFail: (response) =>
@logger.error("site check error")
@ -130,10 +130,12 @@ context.JK.SiteValidator = class SiteValidator
context.JK.RecordingSourceValidator = class RecordingSourceValidator extends SiteValidator
constructor: (site_type, success_callback, fail_callback) ->
super(site_type, success_callback, fail_callback)
super(site_type)
@recording_sources = []
@is_rec_src = true
@add_btn = @input_div.find('a.add-recording-source')
@site_success_callback = success_callback
@site_fail_callback = fail_callback
init: (sources) =>
super()
@ -145,11 +147,17 @@ context.JK.RecordingSourceValidator = class RecordingSourceValidator extends Sit
processSiteCheckSucceed: (response) =>
super(response)
@add_btn.removeClass('disabled')
@recording_sources.push({ url: response.data, recording_id: response.recording_id })
if @site_status
@recording_sources.push({ url: response.data, recording_id: response.recording_id })
if @site_success_callback
@site_success_callback(@input_div)
processSiteCheckFail: (response) =>
super(response)
@add_btn.removeClass('disabled')
if @site_fail_callback
@site_fail_callback(@input_div)
didBlur: () =>
# do nothing, validate on add only

33
web/app/views/clients/_account_profile_samples.html.erb
View File

@ -172,30 +172,13 @@
window.twitterValidator = new JK.SiteValidator('twitter', userNameSuccessCallback, userNameFailCallback);
twitterValidator.init();
window.soundCloudRecordingValidator = new JK.SiteValidator('rec_soundcloud', siteSuccessCallback, siteFailCallback);
window.soundCloudRecordingValidator = new JK.RecordingSourceValidator('rec_soundcloud', siteSuccessCallback, siteFailCallback);
soundCloudRecordingValidator.init();
window.youTubeRecordingValidator = new JK.SiteValidator('rec_youtube', siteSuccessCallback, siteFailCallback);
window.youTubeRecordingValidator = new JK.RecordingSourceValidator('rec_youtube', siteSuccessCallback, siteFailCallback);
youTubeRecordingValidator.init();
}, 1);
$btnAddSoundCloudRecording.click(function(evt) {
evt.preventDefault();
console.log("IN ADD");
if (!$('#rec_soundcloud_validator').hasClass('error')) {
console.log("NO ERROR");
var recordingSources = [];//window.soundCloudRecordingValidator.recordingSources();
console.log("recordingSources=%o", recordingSources);
if (recordingSources && recordingSources.length > 0) {
var $sampleList = $soundCloudSampleList.find('.sample-list');
var addedRecording = recordingSources[recordingSources.length-1];
$sampleList.append('<div class="recording-row left" data-recording-id="' + addedRecording.recording_id + '">');
$sampleList.append(addedRecording.url);
$sampleList.append('</div>');
}
}
});
function userNameSuccessCallback($inputDiv) {
$inputDiv.removeClass('error');
$inputDiv.find('.error-text').remove();
@ -210,6 +193,18 @@
function siteSuccessCallback($inputDiv) {
$inputDiv.removeClass('error');
$inputDiv.find('.error-text').remove();
var recordingSources = window.soundCloudRecordingValidator.recordingSources();
if (recordingSources && recordingSources.length > 0) {
console.log('recordingSources=%o', recordingSources);
var $sampleList = $soundCloudSampleList.find('.sample-list');
var addedRecording = recordingSources[recordingSources.length-1];
$sampleList.append('<div class="recording-row left" data-recording-id="' + addedRecording.recording_id + '">');
$sampleList.append(addedRecording.url);
$sampleList.append('</div>');
}
$inputDiv.find('input').val('');
}
function siteFailCallback($inputDiv) {