Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -rd25e9238849c5bd874163f8433c94b6d606c3433 -r0ab01b8b8bfbc35cb16b758be6b36c9af4091d3b --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision d25e9238849c5bd874163f8433c94b6d606c3433) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 0ab01b8b8bfbc35cb16b758be6b36c9af4091d3b) @@ -129,8 +129,11 @@ if(_canvasModel.isDragging){ ca.stopDrag(); _canvasModel.isDragging = false; + var sequenceActivity:Activity = _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID); - if (ca.activity.parentUIID != null && _canvasModel.getCanvas().ddm.getActivityByUIID(ca.activity.parentUIID).activityTypeID != Activity.SEQUENCE_ACTIVITY_TYPE){ + if (ca.activity.parentUIID != null && + sequenceActivity.activityTypeID != Activity.SEQUENCE_ACTIVITY_TYPE){ + for (var i=0; i _canvasView.gridLayer._width - ca.getVisibleWidth()) ca._x = _canvasView.gridLayer._width - ca.getVisibleWidth(); @@ -280,9 +292,8 @@ Debugger.log('ca.activity.xCoord:'+ca.activity.xCoord,Debugger.GEN,'activityRelease','CanvasController'); - } else { - if (_canvasModel.isTransitionToolActive()){ + if (_canvasModel.isTransitionToolActive()) { _canvasModel.getCanvas().stopTransitionTool(); _canvasModel.activeView.removeTempTrans(); @@ -416,22 +427,29 @@ _canvasModel.getCanvas().stopTransitionTool(); app.controlKeyPressed = "" - }else{ + } else { if(_canvasModel.isDragging){ ca.stopDrag(); //if we are on the bin - trash it isActivityOnBin(ca); - if(ca._x < 0) ca._x = 0; - if(ca._y < 0) ca._y = 0; - if(ca._x > _canvasView.gridLayer._width - ca.getVisibleWidth()) ca._x = _canvasView.gridLayer._width - ca.getVisibleWidth(); - if(ca._y > _canvasView.gridLayer._height - ca.getVisibleHeight()) ca._y = _canvasView.gridLayer._height - ca.getVisibleHeight(); - - // give it the new co-ords and 'drop' it - ca.activity.xCoord = ca._x; - ca.activity.yCoord = ca._y; + var tgt:String = new String(ca._parent); + + if(tgt.indexOf("childActivities_mc")) { + activitySnapBack(ca); + } else { + if(ca._x < 0) ca._x = 0; + if(ca._y < 0) ca._y = 0; + if(ca._x > _canvasView.gridLayer._width - ca.getVisibleWidth()) ca._x = _canvasView.gridLayer._width - ca.getVisibleWidth(); + if(ca._y > _canvasView.gridLayer._height - ca.getVisibleHeight()) ca._y = _canvasView.gridLayer._height - ca.getVisibleHeight(); + + // give it the new co-ords and 'drop' it + ca.activity.xCoord = ca._x; + ca.activity.yCoord = ca._y; + } } + } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as =================================================================== diff -u -rfe232584cdc0697b18352afeb9ff46eab0dc856a -r0ab01b8b8bfbc35cb16b758be6b36c9af4091d3b --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision fe232584cdc0697b18352afeb9ff46eab0dc856a) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision 0ab01b8b8bfbc35cb16b758be6b36c9af4091d3b) @@ -190,6 +190,7 @@ public function updateChildren():Void { _visible = false; + _visibleWidth = CanvasSequenceActivity.TOOL_ACTIVITY_HEIGHT; init(); }