Index: lams_central/web/authoring/authoring.jsp =================================================================== diff -u -r45183a95b8659c01dae05afb4b407f5b37506133 -r8930b0e5d40faa5051971f3989cffdf5a3360f5c --- lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 45183a95b8659c01dae05afb4b407f5b37506133) +++ lams_central/web/authoring/authoring.jsp (.../authoring.jsp) (revision 8930b0e5d40faa5051971f3989cffdf5a3360f5c) @@ -838,7 +838,7 @@ - + @@ -1164,4 +1164,4 @@ - + \ No newline at end of file Index: lams_central/web/includes/javascript/authoring/authoringProperty.js =================================================================== diff -u -r9fed0019a75212121fd9f371484bdd4a5c55c4d6 -r8930b0e5d40faa5051971f3989cffdf5a3360f5c --- lams_central/web/includes/javascript/authoring/authoringProperty.js (.../authoringProperty.js) (revision 9fed0019a75212121fd9f371484bdd4a5c55c4d6) +++ lams_central/web/includes/javascript/authoring/authoringProperty.js (.../authoringProperty.js) (revision 8930b0e5d40faa5051971f3989cffdf5a3360f5c) @@ -217,15 +217,18 @@ activity.description = $('.propertiesContentFieldDescription', content).val(); activity.gateType = $('.propertiesContentFieldGateType', content).val(); - + + $('.propertiesContentFieldStopAtPrecedingActivity', content).closest('tr').hide(); + $('.propertiesContentRowGateTypeBased', content).hide(); if (activity.gateType == 'schedule') { // show inputs for setting delay before the gate is closed $(".propertiesContentRowGateSchedule", content).show(); + $('.propertiesContentFieldStopAtPrecedingActivity', content).closest('tr').show(); activity.offsetDay = +$('.propertiesContentFieldOffsetDay', content).val(); activity.offsetHour = +$('.propertiesContentFieldOffsetHour', content).val(); activity.offsetMinute = +$('.propertiesContentFieldOffsetMinute', content).val(); - + // both of these options must not be on at the same time // stop-at-preceding-activity may prevent preceding activity from completion, // meaning that timer-from-previous-activity-completion will never start @@ -237,39 +240,43 @@ activity.gateStopAtPrecedingActivity = $('.propertiesContentFieldStopAtPrecedingActivity', content).is(':checked'); $('.propertiesContentFieldStopAtPrecedingActivity', content).prop('disabled', false); } - + if (activity.gateStopAtPrecedingActivity) { activity.gateActivityCompletionBased = false; $('.propertiesContentFieldActivityCompletionBased', content).prop('disabled', true).prop('checked', false); } else { $('.propertiesContentFieldActivityCompletionBased', content).prop('disabled', false); } } - + if (activity.gateType == 'password') { + activity.gateStopAtPrecedingActivity = false; $(".propertiesContentRowGatePassword", content).show(); activity.password = $('.propertiesContentFieldPassword', content).val(); } - + // Gate can be input-based if (activity.gateType == 'condition') { + activity.gateStopAtPrecedingActivity = false; var inputRow = $('.propertiesContentFieldInput', content).closest('tr'), inputDefinitionRows = $('.propertiesContentRowConditions', content); - - activity.gateStopAtPrecedingActivity = $('.propertiesContentFieldStopAtPrecedingActivity', content).is(':checked'); - + + activity.input = inputRow.show().find('option:selected').data('input'); if (activity.input) { inputDefinitionRows.show(); - } else { - $('.propertiesContentFieldStopAtPrecedingActivity', content).closest('tr').show(); } - } - + } + if (activity.gateType == 'permission') { + $('.propertiesContentFieldStopAtPrecedingActivity', content).closest('tr').show(); $(".propertiesContentRowPermission", content).show(); activity.gateStopAtPrecedingActivity = $('.propertiesContentFieldStopAtPrecedingActivity', content).is(':checked'); } + + if (activity.gateType == 'sync') { + activity.gateStopAtPrecedingActivity = false; + } if (redrawNeeded) { ActivityLib.removeSelectEffect(activity);