From ab66504532784d3943637c78ffad544b566309f0 Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Mon, 13 Oct 2014 20:58:30 -0400 Subject: [PATCH] VRFS-2344 show musician hover on pages 2-n on Find Session screen --- ruby/lib/jam_ruby/models/music_session.rb | 4 ++-- web/app/assets/javascripts/findSession.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 6168f8b84..90b3620c9 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -372,11 +372,11 @@ module JamRuby ms.invitations << invitation # if the session start time is not within the next 1 minute (user could create a "scheduled session" - # for 8:30 at 8:29. In this case send the regular + # for 8:30 at 8:29. In this case send the regular scheduled session notification since it's still "future") # send SCHEDULED SESSION INVITATION if ms.scheduled_start && (ms.scheduled_start - Time.now.utc) / 60 > 1 Notification.send_scheduled_session_invitation(ms, receiver) - + # otherwise send the notification that allows the user to join the session directly else Notification.send_session_invitation(receiver, user, ms.id) diff --git a/web/app/assets/javascripts/findSession.js b/web/app/assets/javascripts/findSession.js index 98db4761f..f54feb866 100644 --- a/web/app/assets/javascripts/findSession.js +++ b/web/app/assets/javascripts/findSession.js @@ -82,7 +82,6 @@ } }) .always(function() { - context.JK.bindHoverEvents(); $ssSpinner.hide(); }); @@ -162,6 +161,8 @@ $.each(sessions.sessions, function(i, session) { sessionList.renderInactiveSession(session, $(CATEGORY.SCHEDULED.id), undefined, sessions.my_audio_latency); }); + + context.JK.bindHoverEvents(); afterLoadScheduledSessions(sessions.sessions); }