* adding hover bubbles to frontpage VRFS-1047

This commit is contained in:
Seth Call 2014-03-05 12:28:10 -06:00
parent 48c5d2a982
commit 83e793c046
5 changed files with 15 additions and 11 deletions

View File

@ -151,7 +151,11 @@
$element.bt(text, options);
}
context.JK.bindHoverEvents = function () {
context.JK.bindHoverEvents = function ($parent) {
if($parent) {
$parent = $('body');
}
function showBubble(bubble, $hoverElement) {
$hoverElement.attr("bubble-id", bubble.id);
@ -171,7 +175,7 @@
}
// MUSICIAN
$("[hoveraction='musician']").hoverIntent({
$("[hoveraction='musician']", $parent).hoverIntent({
over: function () {
var bubble = new JK.MusicianHoverBubble($(this).attr('user-id'), $(this).offset());
showBubble(bubble, $(this));
@ -183,7 +187,7 @@
});
// FAN
$("[hoveraction='fan']").hoverIntent({
$("[hoveraction='fan']", $parent).hoverIntent({
over: function () {
var bubble = new JK.FanHoverBubble($(this).attr('user-id'), $(this).offset());
showBubble(bubble, $(this));
@ -195,7 +199,7 @@
});
// BAND
$("[hoveraction='band']").hoverIntent({
$("[hoveraction='band']", $parent).hoverIntent({
over: function () {
var bubble = new JK.BandHoverBubble($(this).attr('band-id'), $(this).offset());
showBubble(bubble, $(this));
@ -207,7 +211,7 @@
});
// SESSION
$("[hoveraction='session']").hoverIntent({
$("[hoveraction='session']", $parent).hoverIntent({
over: function () {
var bubble = new JK.SessionHoverBubble($(this).attr('session-id'), $(this).offset());
showBubble(bubble, $(this));
@ -219,7 +223,7 @@
});
// RECORDING
$("[hoveraction='recording']").hoverIntent({
$("[hoveraction='recording']", $parent).hoverIntent({
over: function () {
var bubble = new JK.RecordingHoverBubble($(this).attr('recording-id'), $(this).offset());
showBubble(bubble, $(this));

View File

@ -1,6 +1,6 @@
class ApiClaimedRecordingsController < ApiController
before_filter :api_signed_in_user, :except => [ :download ]
before_filter :api_signed_in_user, :except => [ :download, :show ]
before_filter :look_up_claimed_recording, :only => [ :show, :update, :delete, :download ]
respond_to :json

View File

@ -3,7 +3,7 @@ require 'aws-sdk'
class ApiMusicSessionsController < ApiController
# have to be signed in currently to see this screen
before_filter :api_signed_in_user, :except => [ :add_like, :show ]
before_filter :api_signed_in_user, :except => [ :add_like, :show, :history_show ]
before_filter :lookup_session, only: [:show, :update, :delete, :claimed_recording_start, :claimed_recording_stop, :track_sync]
skip_before_filter :api_signed_in_user, only: [:perf_upload]
@ -292,7 +292,7 @@ class ApiMusicSessionsController < ApiController
end
end
def history_show
def history_show
@history = MusicSessionHistory.find(params[:id])
end

View File

@ -4,7 +4,7 @@
= session_avatar(feed_item)
/ type and artist
.left.ml20.w15
.title SESSION
.title{hoveraction: 'session', :'session-id' => feed_item.id } SESSION
.artist
= session_artist_name(feed_item)
= timeago(feed_item.created_at, class: 'small created_at')

View File

@ -4,7 +4,7 @@
= recording_avatar(feed_item)
/ type and artist
.left.ml20.w15
.title RECORDING
.title{hoveraction: 'recording', :'recording-id' => feed_item.candidate_claimed_recording.id } RECORDING
.artist
= recording_artist_name(feed_item)
= timeago(feed_item.created_at, class: 'small created_at')