seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-3112 - make recording smaller so no horizontal scroll bar

This commit is contained in:
Seth Call 2015-04-28 09:44:56 -05:00
parent 255ea39e77
commit cada0ed0b9
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/app/assets/javascripts/session.js
View File

@ -2546,11 +2546,12 @@
}
function displayStartedRecording() {
// the commented out code reflects dropping the counter as your recording to save space
startTimeDate = new Date;
$recordingTimer = $("<span id='recording-timer'>(0:00)</span>");
var $recordingStatus = $('<span></span>').append("<span>Stop Recording</span>").append($recordingTimer);
//$recordingTimer = $("<span id='recording-timer'>(0:00)</span>");
var $recordingStatus = $('<span></span>').append("<span>Stop Recording</span>")//.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() {

2
web/app/views/clients/_session.html.slim
View File

@ -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

6
web/spec/features/recordings_spec.rb
View File

@ -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

2
web/spec/support/utilities.rb
View File

@ -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