VRFS-1939 VRFS-1936 fixed session and scheduled musician invite dialog

web/app/assets/javascripts/accounts_session_detail.js

@@ -21,6 +21,8 @@
     var $templateOpenSlots = null;
     var instrument_logo_map = context.JK.getInstrumentIconMap24();
     var invitationDialog = null;
+    var inviteMusiciansUtil = null;
+    var friendInput=null;
 
 
     var LATENCY = {
@@ -42,7 +44,11 @@
     function inviteMusicians(e) {
       e.preventDefault();
 
-      invitationDialog.showEmailDialog();
+      friendInput = inviteMusiciansUtil.inviteSessionUpdate('#update-session-invite-musicians', 
+                                                            sessionId);
+      inviteMusiciansUtil.loadFriends();
+      $(friendInput).show();
+      // invitationDialog.showEmailDialog();
     }
 
     function cancelRsvpRequest(e) {
@@ -120,6 +126,7 @@
       $sessionPageBtn.on('click', openSessionPage);
       $screen.find(".approveRsvpRequest").on('click', approveRsvpRequest);
       $screen.find(".declineRsvpRequest").on('click', declineRsvpRequest);
+      $(friendInput).focus(function() { $(this).val(''); })
 
       $screen.find(".cancelSessionRsvp").on('click', function(e) {
         e.preventDefault();
@@ -393,6 +400,10 @@
       $sessionDetail = $screen.find("#account-session-detail-div");
       $shareUrl = $screen.find('.share-url');
       invitationDialog = invitationDlg;
+
+      inviteMusiciansUtil = new JK.InviteMusiciansUtil(JK.app);
+      inviteMusiciansUtil.initialize(JK.FriendSelectorDialogInstance);
+
       $templateOpenSlots = $('#template-open-slots');
     }
 

web/app/assets/javascripts/inviteMusicians.js

@@ -59,6 +59,8 @@
                     addInvitation(dd.name, dd.id);
                 });
             }).fail(app.ajaxError);
+
+            return friendInput;
         }
 
         this.clearSelections = function() {
@@ -133,7 +135,7 @@
 
             } else {
                 $(friendInput).select();
-                context.alert('Invitation already exists for this musician.');
+                // context.alert('Invitation already exists for this musician.');
             }
         }
 

web/app/assets/javascripts/session.js

@@ -32,6 +32,7 @@
         var playbackControls = null;
         var promptLeave = false;
         var rateSessionDialog = null;
+        var friendInput=null;
 
         var rest = context.JK.Rest();
 
@@ -133,6 +134,7 @@
             .done(function(){
               initializeSession();
             })
+
         }
 
         function notifyWithUserInfo(title , text, clientId) {
@@ -1354,7 +1356,10 @@
         }
 
         function inviteMusicians() {
-            inviteMusiciansUtil.inviteSessionUpdate('#update-session-invite-musicians', sessionId);
+            friendInput = inviteMusiciansUtil.inviteSessionUpdate('#update-session-invite-musicians', 
+                                                                  sessionId);
+            inviteMusiciansUtil.loadFriends();
+            $(friendInput).show();
         }
 
         function events() {
@@ -1365,6 +1370,7 @@
             $('#recording-start-stop').on('click', startStopRecording);
             $('#open-a-recording').on('click', openRecording);
             $('#session-invite-musicians').on('click', inviteMusicians);
+            $('#session-invite-musicians2').on('click', inviteMusicians);
             $('#track-settings').click(function() {
                 configureTrackDialog.refresh();
                 configureTrackDialog.showVoiceChatPanel(true);
@@ -1376,6 +1382,7 @@
                 .on('pause', onPause)
                 .on('play', onPlay)
                 .on('change-position', onChangePlayPosition);
+            $(friendInput).focus(function() { $(this).val(''); })
         }
 
         this.initialize = function(localRecordingsDialogInstance, recordingFinishedDialogInstance, friendSelectorDialog) {

web/app/views/clients/_account_session_detail.html.haml

@@ -16,7 +16,7 @@
           .right
             %a.cancel-rsvp.button-orange{href: "#"} CANCEL RSVP
             %a.session-detail-page.button-orange{href: "#", rel:'external'} SESSION PAGE
-            %a.invite-others.button-orange{href: "#"} INVITE OTHERS
+            %a.invite-others.button-orange{'layout-link' => 'select-invites','href' => "#"} INVITE OTHERS
           .clearall
 
         #account-session-detail-div
@@ -160,4 +160,4 @@
 
 %script{type: 'text/template', id: 'template-account-session-latency'}
   .latency{class: "{{data.latency_style}}"}
-    {{data.latency_text}}
+    {{data.latency_text}}

web/app/views/clients/_session.html.erb

@@ -78,7 +78,7 @@
                             <div id="session-livetracks-container">
                                 <p class="when-empty">
                                 No Live Tracks:<br/>
-                                <a>Invite Other Musicians</a> to<br/>
+                                <a layout-link="select-invites", href="#" id="session-invite-musicians2">Invite Other Musicians</a> to<br/>
                                 Add Live Tracks
                                 </p>
                             </div>