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

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-07-25 15:01:26 -05:00
parent adb0b15555 b09551548d
commit c13bbb95c0
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/assets/javascripts/accounts_session_properties.js
View File

@ -70,7 +70,7 @@
function toggleStartTime() {
var valueSelected = $startTimeList.find('option:selected').val();
var startIndex = defaultTimeArray.indexOf(valueSelected) + 2;
var startIndex = defaultTimeArray.indexOf(valueSelected) + 1;
$endTimeList.empty();
// if (startIndex == defaultTimeArray.length ) {
@ -94,6 +94,8 @@
$endTimeList.append($('<option value="' + strTime + '" class="label">' + strTime +'</option>'));
});
$endTimeList.val(defaultTimeArray[(startIndex + 1) % defaultTimeArray.length]);
context.JK.dropdown($endTimeList);
}

6
web/app/assets/javascripts/scheduled_session.js
View File

@ -979,7 +979,7 @@
function toggleStartTime(dontRebuildDropdowns) {
var valueSelected = $startTimeList.find('option:selected').val();
var startIndex = defaultTimeArray.indexOf(valueSelected) + 2;
var startIndex = defaultTimeArray.indexOf(valueSelected) + 1;
var $endTimeList = $('#end-time-list');
$endTimeList.empty();
@ -1004,8 +1004,8 @@
$endTimeList.append($('<option value="' + strTime + '" class="label">' + strTime +'</option>'));
});
if (createSessionSettings.endTime != defaultTimeArray[startIndex]) {
createSessionSettings.endTime = defaultTimeArray[startIndex];
if (createSessionSettings.endTime != defaultTimeArray[startIndex + 1]) {
createSessionSettings.endTime = defaultTimeArray[(startIndex + 1) % defaultTimeArray.length];
}
$endTimeList.val(createSessionSettings.endTime);

4
web/spec/features/account_spec.rb
View File

@ -176,7 +176,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
find('#account-session-properties-div #session-prop-start-date').value.should eq date_string
find('#account-session-properties-div .selected', text: '11:30 PM')
find('#account-session-properties-div .selected', text: '12:00 AM')
find('#account-session-properties-div .selected', text: '12:30 AM')
find('#account-session-properties-div .selected', text: '(GMT+00:00) UTC')
find('#account-session-properties-div #session-prop-genre .selected', text: 'African')
find('#account-session-properties-div #session-prop-name').value.should eq "Updated Name"
@ -194,7 +194,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
# check fields with original values
find('#account-session-properties-div #session-prop-start-date').value.should eq date_string
find('#account-session-properties-div .selected', text: '11:30 PM')
find('#account-session-properties-div .selected', text: '12:00 AM')
find('#account-session-properties-div .selected', text: '12:30 AM')
find('#account-session-properties-div .selected', text: '(GMT+00:00) UTC')
find('#account-session-properties-div #session-prop-genre .selected', text: 'African')
find('#account-session-properties-div #session-prop-name').value.should eq "Updated Name"