diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index d85a15b30..bcc10e9a1 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -102,6 +102,9 @@ sessionId = data.id; $('#session-mytracks-container').empty(); displayDoneRecording(); // assumption is that you can't join a recording session, so this should be safe + + var shareDialog = new JK.ShareDialog(context.JK.app, sessionId, "session"); + shareDialog.initialize(context.JK.FacebookHelperInstance); } function alertCallback(type, text) { diff --git a/web/app/assets/javascripts/shareDialog.js b/web/app/assets/javascripts/shareDialog.js index efe69f037..28af2721c 100644 --- a/web/app/assets/javascripts/shareDialog.js +++ b/web/app/assets/javascripts/shareDialog.js @@ -257,7 +257,7 @@ $("#divWidgetPreview").addClass(entityType); // SESSION - if (entityType === sessionText.toLowerCase() ) { + if (entityType === sessionText.toLowerCase()) { $("#lblWidgetCodeType").html(sessionText.toLowerCase()); $("#lblWidgetPreviewType").html(sessionText.toLowerCase()); $("#spnWidgetCodeBranding").text(liveSessionText.toLowerCase()); @@ -265,12 +265,13 @@ rest.getSessionHistory(entityId) .done(function(response) { - var name, photoUrl; + // var name, photoUrl; + $(".link-contents").html(response.share_url); }); } // RECORDING - else { + else if (entityType === "recording") { var recordedText = textMap.RECORDED.toLowerCase(); $("#lblWidgetCodeType").text(textMap.RECORDING); $("#lblWidgetPreviewType").text(textMap.RECORDING); @@ -290,6 +291,8 @@ photoUrl = context.JK.resolveAvatarUrl(response.recording.owner.photo_url); } + $(".link-contents").html(response.share_url); + $("#imgWidgetCodeAvatar").attr('src', photoUrl); $("#imgWidgetPreviewAvatar").attr('src', photoUrl); diff --git a/web/app/assets/javascripts/web/recordings.js b/web/app/assets/javascripts/web/recordings.js index 67818ba87..1d4c38c32 100644 --- a/web/app/assets/javascripts/web/recordings.js +++ b/web/app/assets/javascripts/web/recordings.js @@ -55,6 +55,8 @@ $("#txtRecordingComment").keypress(function(e) { if (e.which === 13) { addComment(); + $(this).val(''); + $(this).blur(); } }); } diff --git a/web/app/assets/javascripts/web/sessions.js b/web/app/assets/javascripts/web/sessions.js index 23559a930..b0b8b02c3 100644 --- a/web/app/assets/javascripts/web/sessions.js +++ b/web/app/assets/javascripts/web/sessions.js @@ -50,7 +50,8 @@ $("#txtSessionComment").keypress(function(e) { if (e.which === 13) { addComment(); - this.val('') + $(this).val(''); + $(this).blur(); } }); } diff --git a/web/app/views/api_claimed_recordings/show.rabl b/web/app/views/api_claimed_recordings/show.rabl index 10964baa6..1db99c371 100644 --- a/web/app/views/api_claimed_recordings/show.rabl +++ b/web/app/views/api_claimed_recordings/show.rabl @@ -6,8 +6,10 @@ object @claimed_recording attributes :id, :name, :description, :is_public, :is_downloadable, :genre_id -node :share_url do|claimed_recording| - share_token_url(claimed_recording.share_token.token) +node :share_url do |claimed_recording| + unless claimed_recording.share_token.nil? + share_token_url(claimed_recording.share_token.token) + end end child(:recording => :recording) { diff --git a/web/app/views/api_music_sessions/history_show.rabl b/web/app/views/api_music_sessions/history_show.rabl index d81ac8813..7296aca8f 100644 --- a/web/app/views/api_music_sessions/history_show.rabl +++ b/web/app/views/api_music_sessions/history_show.rabl @@ -2,6 +2,12 @@ object @history attributes :music_session_id, :description, :genres +node :share_url do |history| + unless history.share_token.nil? + share_token_url(history.share_token.token) + end +end + child(:user => :creator) { attributes :name, :photo_url } diff --git a/web/app/views/api_music_sessions/show.rabl b/web/app/views/api_music_sessions/show.rabl index a4d7ff6f6..6121cb111 100644 --- a/web/app/views/api_music_sessions/show.rabl +++ b/web/app/views/api_music_sessions/show.rabl @@ -12,8 +12,10 @@ if :is_recording? end end -node :share_url do|music_session| +node :share_url do |music_session| + unless music_session.music_session_history.share_token.nil? share_token_url(music_session.music_session_history.share_token.token) + end end child(:connections => :participants) { diff --git a/web/app/views/clients/_shareDialog.html.erb b/web/app/views/clients/_shareDialog.html.erb index 531221816..cc28817e5 100644 --- a/web/app/views/clients/_shareDialog.html.erb +++ b/web/app/views/clients/_shareDialog.html.erb @@ -39,10 +39,6 @@

Share a Link:

- <% unless true %> - <%= "#{root_url}" %> - <% end %> - http://www.jamkazam.com/SOUt2Az
COPY LINK
diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb index 45ef50f11..c4bd4397c 100644 --- a/web/app/views/clients/index.html.erb +++ b/web/app/views/clients/index.html.erb @@ -52,6 +52,8 @@ JK = JK || {}; + JK.root_url = "<%= root_url %>" + <% if Rails.env == "development" %> // if in development mode, we assume you are running websocket-gateway // on the same host as you hit your server. diff --git a/web/app/views/layouts/application.html.erb b/web/app/views/layouts/application.html.erb index 8dc785d15..851374485 100644 --- a/web/app/views/layouts/application.html.erb +++ b/web/app/views/layouts/application.html.erb @@ -44,6 +44,8 @@ $(function () { JK = JK || {}; + JK.root_url = "<%= root_url %>" + <% if current_user %> JK.currentUserId = '<%= current_user.id %>'; JK.currentUserAvatarUrl = JK.resolveAvatarUrl('<%= current_user.photo_url %>'); diff --git a/web/app/views/layouts/corporate.html.erb b/web/app/views/layouts/corporate.html.erb index 964685fc3..2511e7cc6 100644 --- a/web/app/views/layouts/corporate.html.erb +++ b/web/app/views/layouts/corporate.html.erb @@ -64,6 +64,8 @@ $(function () { JK = JK || {}; + JK.root_url = "<%= root_url %>" + <% if current_user %> JK.currentUserId = '<%= current_user.id %>'; JK.currentUserAvatarUrl = JK.resolveAvatarUrl('<%= current_user.photo_url %>'); diff --git a/web/app/views/layouts/landing.erb b/web/app/views/layouts/landing.erb index a417a72ef..3544af922 100644 --- a/web/app/views/layouts/landing.erb +++ b/web/app/views/layouts/landing.erb @@ -46,6 +46,8 @@ $(function () { JK = JK || {}; + JK.root_url = "<%= root_url %>" + <% if current_user %> JK.currentUserId = '<%= current_user.id %>'; JK.currentUserAvatarUrl = JK.resolveAvatarUrl('<%= current_user.photo_url %>'); diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.erb index 3d5fddd5d..00548d34d 100644 --- a/web/app/views/layouts/web.erb +++ b/web/app/views/layouts/web.erb @@ -63,6 +63,8 @@ JK = JK || {}; + JK.root_url = "<%= root_url %>" + <% if current_user %> JK.currentUserId = '<%= current_user.id %>'; JK.currentUserAvatarUrl = JK.resolveAvatarUrl('<%= current_user.photo_url %>'); diff --git a/web/app/views/music_sessions/show.html.erb b/web/app/views/music_sessions/show.html.erb index 9c7332e25..b7d29d213 100644 --- a/web/app/views/music_sessions/show.html.erb +++ b/web/app/views/music_sessions/show.html.erb @@ -90,7 +90,7 @@ <%= javascript_include_tag "web/sessions" %> <% content_for :extra_dialogs do %> - <%= render :partial => "clients/shareDialog", :locals => {:session => @music_session} %> + <%= render :partial => "clients/shareDialog" %> <% end %> <% content_for :extra_js do %> diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb index 865139f2e..3f0173e12 100644 --- a/web/app/views/recordings/show.html.erb +++ b/web/app/views/recordings/show.html.erb @@ -90,7 +90,7 @@ <%= javascript_include_tag "web/recordings" %> <% content_for :extra_dialogs do %> - <%= render :partial => "clients/shareDialog", :locals => {:recording => @claimed_recording, :share_token => @claimed_recording.share_token} %> + <%= render :partial => "clients/shareDialog" %> <% end %> <% content_for :extra_js do %>