diff --git a/web/app/assets/javascripts/hoverBand.js b/web/app/assets/javascripts/hoverBand.js index 7f85e0dbc..3d5115341 100644 --- a/web/app/assets/javascripts/hoverBand.js +++ b/web/app/assets/javascripts/hoverBand.js @@ -32,8 +32,8 @@ $.each(response.musicians, function(index, val) { var instrumentHtml = ''; - musicianHtml += ''; - musicianHtml += '' + val.name + ''; + musicianHtml += ''; + musicianHtml += '<' + val.name + ''; instrumentHtml = '
'; if (val.instruments) { // @FIXME: edge case for Test user that has no instruments? @@ -75,6 +75,8 @@ }); $(hoverSelector).append('

Band Detail

' + bandHtml); + + context.JK.bindProfileClickEvents(hoverSelector); configureActionButtons(response); }) .fail(function(xhr) { diff --git a/web/app/assets/javascripts/hoverFan.js b/web/app/assets/javascripts/hoverFan.js index a68f65204..7bf13ec1c 100644 --- a/web/app/assets/javascripts/hoverFan.js +++ b/web/app/assets/javascripts/hoverFan.js @@ -36,19 +36,21 @@ followingHtml += ''; } - var avatarUrl, profilePath; + var avatarUrl, attrId, type; if (val.type === "band") { avatarUrl = context.JK.resolveBandAvatarUrl(val.photo_url); - profilePath = "bandProfile"; + attrId = "band-id"; + type = "band"; } else { avatarUrl = context.JK.resolveAvatarUrl(val.photo_url); - profilePath = "profile"; + attrId = "user-id"; + type = "musician"; } - followingHtml += ''; - followingHtml += '' + val.name + ''; + followingHtml += ''; + followingHtml += '' + val.name + ''; if (index % 2 > 0) { followingHtml += ''; @@ -76,6 +78,8 @@ }); $(hoverSelector).append('

Fan Detail

' + fanHtml); + + context.JK.bindProfileClickEvents(hoverSelector); configureActionButtons(response); }) .fail(function(xhr) { diff --git a/web/app/assets/javascripts/hoverMusician.js b/web/app/assets/javascripts/hoverMusician.js index 360bc664d..985da502b 100644 --- a/web/app/assets/javascripts/hoverMusician.js +++ b/web/app/assets/javascripts/hoverMusician.js @@ -42,19 +42,21 @@ followingHtml += ''; } - var avatarUrl, profilePath; + var avatarUrl, attrId, type; if (val.type === "band") { avatarUrl = context.JK.resolveBandAvatarUrl(val.photo_url); - profilePath = "bandProfile"; + attrId = "band-id"; + type = "band"; } else { avatarUrl = context.JK.resolveAvatarUrl(val.photo_url); - profilePath = "profile"; + attrId = "user-id"; + type = "musician"; } - followingHtml += ''; - followingHtml += '' + val.name + ''; + followingHtml += ''; + followingHtml += '' + val.name + ''; if (index % 2 > 0) { followingHtml += ''; @@ -101,6 +103,8 @@ }); $(hoverSelector).append('

Musician Detail

' + musicianHtml); + + context.JK.bindProfileClickEvents(hoverSelector); configureActionButtons(response); }) .fail(function(xhr) { diff --git a/web/app/assets/javascripts/web/recordings.js b/web/app/assets/javascripts/web/recordings.js index 1fecac65b..c83b42007 100644 --- a/web/app/assets/javascripts/web/recordings.js +++ b/web/app/assets/javascripts/web/recordings.js @@ -94,6 +94,7 @@ $(".landing-comment-scroller").prepend(commentHtml); } + context.JK.bindProfileClickEvents(); context.JK.bindHoverEvents(); } diff --git a/web/app/assets/javascripts/web/sessions.js b/web/app/assets/javascripts/web/sessions.js index c31bd62c7..66fadcbfb 100644 --- a/web/app/assets/javascripts/web/sessions.js +++ b/web/app/assets/javascripts/web/sessions.js @@ -49,6 +49,7 @@ $(".landing-comment-scroller").prepend(commentHtml); } + context.JK.bindProfileClickEvents(); context.JK.bindHoverEvents(); } @@ -129,7 +130,6 @@ $("#btnLike").click(like); $playButton.trigger('click'); - pollForUpdates(musicSessionId); } diff --git a/web/app/views/shared/_comments.html.erb b/web/app/views/shared/_comments.html.erb index 03f348550..a0057319f 100644 --- a/web/app/views/shared/_comments.html.erb +++ b/web/app/views/shared/_comments.html.erb @@ -17,11 +17,13 @@