Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r42da01114e8741010935a9fe5f0518f7d4fe86f6 -r14c9223586fcd9b7336ae6a8711558c44df089ec Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r42da01114e8741010935a9fe5f0518f7d4fe86f6 -r14c9223586fcd9b7336ae6a8711558c44df089ec Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r0d2b62ff5f1e06568936567798a8e53c1c15eeec -r14c9223586fcd9b7336ae6a8711558c44df089ec --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 0d2b62ff5f1e06568936567798a8e53c1c15eeec) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 14c9223586fcd9b7336ae6a8711558c44df089ec) @@ -263,10 +263,10 @@ activitySnapBack(ca); var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('cv_invalid_optional_activity', [ca.activity.title]) : Dictionary.getValue('cv_invalid_optional_seq_activity', [ca.activity.title]); LFMessage.showMessageAlert(msg); - //} else if(_canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID).hasBranches) { - // activitySnapBack(ca); - // var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('cv_invalid_optional_activity_no_branches', [ca.activity.title]) : Dictionary.getValue('cv_invalid_optional_seq_activity_no_branches', [ca.activity.title]); - // LFMessage.showMessageAlert(msg); + } else if(_canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID).hasBranches) { + activitySnapBack(ca); + var msg:String = (!optionalOnCanvas[i].activity.isSequenceBased) ? Dictionary.getValue('cv_invalid_optional_activity_no_branches', [ca.activity.title]) : Dictionary.getValue('cv_invalid_optional_seq_activity_no_branches', [ca.activity.title]); + LFMessage.showMessageAlert(msg); } else if(optionalOnCanvas[i].activity.isOptionsWithSequencesActivity() && optionalOnCanvas[i].activity.noSequences <= 0) { activitySnapBack(ca); var msg:String = Dictionary.getValue('ta_iconDrop_optseq_error_msg');