Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rb7baeaebf9509f34b2d61d48cfc6dacd53d09576 -rf13f1ce2f5bc283548db73b31dc3d40d14518dce Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rb7baeaebf9509f34b2d61d48cfc6dacd53d09576 -rf13f1ce2f5bc283548db73b31dc3d40d14518dce Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r4fd62cd151fdec92474bbb5189e507d67deba3bf -rf13f1ce2f5bc283548db73b31dc3d40d14518dce --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 4fd62cd151fdec92474bbb5189e507d67deba3bf) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision f13f1ce2f5bc283548db73b31dc3d40d14518dce) @@ -85,19 +85,19 @@ } } else { - - if(ca.activity.parentUIID != null && (parentAct.isParallelActivity() || - ca.activity.isOptionalSequenceActivity(parentAct))) { + var parentAct = _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID); + var parentSelectedAct = _canvasModel.getCanvas().ddm.getActivityByUIID(_tempSelectedItem.activity.parentUIID); + var optionalOnCanvas:Array = _canvasModel.findOptionalActivities(); + + if(ca.activity.parentUIID != null && + (parentAct.isParallelActivity() || ca.activity.isOptionalSequenceActivity(parentAct))) { _canvasModel.isDragging = false; + return; } else { ca.startDrag(false); _canvasModel.isDragging = true; } - var parentAct = _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID); - var parentSelectedAct = _canvasModel.getCanvas().ddm.getActivityByUIID(_tempSelectedItem.activity.parentUIID); - var optionalOnCanvas:Array = _canvasModel.findOptionalActivities(); - if(_tempSelectedItem != null) { // clear currently selected activity