diff --git a/app/assets/javascripts/active_meetings.js b/app/assets/javascripts/active_meetings.js index d6017c14..405b38e6 100644 --- a/app/assets/javascripts/active_meetings.js +++ b/app/assets/javascripts/active_meetings.js @@ -18,7 +18,7 @@ // the landing page using custom Actioncable events. MEETINGS = {} -LOADING_DELAY = 2500 // milliseconds. +LOADING_DELAY = 1750 // milliseconds. updatePreviousMeetings = function(){ $("ul.previously-joined li").each(function(idx, li) { diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index a0d23113..f82d831a 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -314,7 +314,7 @@ class @Recordings cloud = selectedUpload.find('.cloud-blue') check = selectedUpload.find('.green-check') spinner = selectedUpload.find('.load-spinner') - + showAlert(I18n.successful_upload, 4000); spinner.hide() @@ -359,7 +359,8 @@ class @Recordings # Determine if the recording can be uploaded to Youtube. $.ajax({ method: 'POST', - data: {'rec_id': id} + data: {'rec_id': id}, + async: false, url: recordingsObject.getRecordingsURL() + '/can_upload' }).success((res_data) -> canUpload = res_data['uploadable']