diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 0b54f9854..d7246dd5d 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -2546,11 +2546,12 @@ } function displayStartedRecording() { + // the commented out code reflects dropping the counter as your recording to save space startTimeDate = new Date; - $recordingTimer = $("(0:00)"); - var $recordingStatus = $('').append("Stop Recording").append($recordingTimer); + //$recordingTimer = $("(0:00)"); + var $recordingStatus = $('').append("Stop Recording")//.append($recordingTimer); $('#recording-status').html( $recordingStatus ); - recordingTimerInterval = setInterval(updateRecordingTimer, 1000); + //recordingTimerInterval = setInterval(updateRecordingTimer, 1000); } function displayStoppingRecording(data) { @@ -2577,7 +2578,7 @@ $recordingTimer = null; $('#recording-start-stop').removeClass('currently-recording'); - $('#recording-status').text("Make a Recording"); + $('#recording-status').text("Make Recording"); } function lockControlsforJamTrackRecording() { diff --git a/web/app/views/clients/_session.html.slim b/web/app/views/clients/_session.html.slim index 7cd5f6e73..bf3c37af6 100644 --- a/web/app/views/clients/_session.html.slim +++ b/web/app/views/clients/_session.html.slim @@ -77,7 +77,7 @@ = image_tag "content/recordbutton-off.png", {:width => 20, :height => 20, :align => "absmiddle"} |    span#recording-status - | Make a Recording + | Make Recording .session-recordings h2 | other audio diff --git a/web/spec/features/recordings_spec.rb b/web/spec/features/recordings_spec.rb index 9abc9b282..d005456a7 100644 --- a/web/spec/features/recordings_spec.rb +++ b/web/spec/features/recordings_spec.rb @@ -57,7 +57,7 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature in_client(joiner1) do find('#notification').should have_content 'Recording Discarded' find('#notification').should have_content 'did not respond to the stop signal' - find('#recording-status').should have_content 'Make a Recording' + find('#recording-status').should have_content 'Make Recording' end end @@ -91,13 +91,13 @@ describe "Session Recordings", :js => true, :type => :feature, :capybara_feature in_client(joiner1) do find('#notification').should have_content 'Recording Discarded' find('#notification').should have_content 'did not respond to the stop signal' - find('#recording-status').should have_content 'Make a Recording' + find('#recording-status').should have_content 'Make Recording' end in_client(joiner2) do find('#notification').should have_content 'Recording Discarded' find('#notification').should have_content 'did not respond to the stop signal' - find('#recording-status').should have_content 'Make a Recording' + find('#recording-status').should have_content 'Make Recording' end end diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb index ab7ff2cc8..8c06407da 100644 --- a/web/spec/support/utilities.rb +++ b/web/spec/support/utilities.rb @@ -562,7 +562,7 @@ def stop_recording end def assert_recording_finished - find('#recording-status').should have_content 'Make a Recording' + find('#recording-status').should have_content 'Make Recording' should have_selector('h1', text: 'recording finished') end