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

Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2

This commit is contained in:
Jonathan Kolyer 2015-04-04 23:43:34 +00:00
parent 279f97ec9a 40899dab90
commit 08198e0aae
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/app/assets/javascripts/accounts_profile_samples.js
View File

@ -114,6 +114,8 @@
}
function loadSamples(samples, type, $sampleList, recordingSources) {
$sampleList.empty();
if (type === 'jamkazam') {
}
@ -127,6 +129,7 @@
'recording_title': val.description
});
// TODO: this code is repeated in HTML file
var recordingIdAttr = ' data-recording-id="' + val.service_id + '" ';
var recordingUrlAttr = ' data-recording-url="' + val.url + '" ';
var recordingTitleAttr = ' data-recording-title="' + val.description + '"';
@ -209,8 +212,6 @@
'user_id': context.JK.currentUserId,
'service_type': type,
'claimed_recording_id': id,
'url': url,
'description': title
});
}

2
web/app/assets/javascripts/profile.js
View File

@ -565,7 +565,7 @@
});
$.each(soundCloudSamples, function(index, sample) {
$soundCloudSamples.append("<a href='" + sample.url + "' rel='external'>" + formatTitle(sample.description) + "</a><br/>");
$soundCloudSamples.append("<a href='" + sample.url + "' rel='external'>" + formatTitle(sample.description) + "</a><br/>");
});
$.each(youTubeSamples, function(index, sample) {

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

@ -136,10 +136,10 @@
$('div[data-recording-id=' + recordingId + ']').remove();
if (type === 'soundcloud') {
window.soundCloudRecordingValidator.removeRecordingId(recordingId.toString());
window.soundCloudRecordingValidator.removeRecordingId(recordingId);
}
else if (type === 'youtube') {
window.youTubeRecordingValidator.removeRecordingId(recordingId.toString());
window.youTubeRecordingValidator.removeRecordingId(recordingId);
}
}