Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as,v
diff -u -r1.33 -r1.34
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	13 Nov 2007 07:41:01 -0000	1.33
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	15 Nov 2007 02:22:32 -0000	1.34
@@ -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<optionalOnCanvas.length; i++){
 					if (ca.activity.parentUIID == optionalOnCanvas[i].activity.activityUIID){
 						if (optionalOnCanvas[i].locked == false){
@@ -143,10 +146,18 @@
 							} else {
 								activitySnapBack(ca);
 							}
+							
 						}
 					}
 				}
 				
+			} else if(ca.activity.parentUIID != null && 
+						sequenceActivity.isSequenceActivity()) {
+				for (var i=0; i<optionalOnCanvas.length; i++) {
+					if (sequenceActivity.parentUIID == optionalOnCanvas[i].activity.activityUIID)
+						if (optionalOnCanvas[i].locked == false)
+							activitySnapBack(ca);
+				}
 			} else {
 			
 				//if we are on the optional Activity remove this activity from canvas and assign it a parentID of optional activity and place it in the optional activity window.
@@ -205,19 +216,20 @@
 						
 					}
 				}
+				
 			}
 			
 			//if we are on the bin - trash it
 			isActivityOnBin(ca);
 			
 			//get a view if ther is not one
-			if(!_canvasView){
+			if(!_canvasView)
 				_canvasView =  CanvasView(getView());
-			}
 			
 			// restricting (x, y) position to positive plane only
 			Debugger.log("ca x: " + ca._x, Debugger.CRITICAL, "activityRelease", "CanvasController");
 			Debugger.log("ca y: " + ca._y, Debugger.CRITICAL, "activityRelease", "CanvasController");
+			
 			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();
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	14 Nov 2007 07:28:04 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	15 Nov 2007 02:22:33 -0000	1.6
@@ -190,6 +190,7 @@
 	
 	public function updateChildren():Void {
 		_visible = false;
+		_visibleWidth = CanvasSequenceActivity.TOOL_ACTIVITY_HEIGHT;
 		init();
 	}