Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rc865453cba19c7f353a91ba411144403c914703c -rbcdab8016c59a648b9a9824d0451ac7cd8c55d2e Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rc865453cba19c7f353a91ba411144403c914703c -rbcdab8016c59a648b9a9824d0451ac7cd8c55d2e Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -rc865453cba19c7f353a91ba411144403c914703c -rbcdab8016c59a648b9a9824d0451ac7cd8c55d2e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision c865453cba19c7f353a91ba411144403c914703c) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision bcdab8016c59a648b9a9824d0451ac7cd8c55d2e) @@ -143,7 +143,6 @@ for (var i=0; i 142 || ca._x < -129 || ca._y < -55 || @@ -176,11 +175,17 @@ ca.swapDepths(DepthManager.kTop); } + Debugger.log("vHeight: " + optionalOnCanvas[i].getVisibleHeight(), Debugger.CRITICAL, "activityRelease", "CanvasController"); + Debugger.log("ca._y: " + ca._y, Debugger.CRITICAL, "activityRelease", "CanvasController"); + Debugger.log("yCoord: " + sequenceActivity.yCoord, Debugger.CRITICAL, "activityRelease", "CanvasController"); + + Debugger.log("ca.getVisibleHeight(): " + ca.getVisibleHeight(), Debugger.CRITICAL, "activityRelease", "CanvasController"); + if (optionalOnCanvas[i].locked == false) { if (ca._x > optionalOnCanvas[i].getVisibleWidth() || ca._x < -ca.getVisibleWidth() || ca._y < -ca.getVisibleHeight() - sequenceActivity.yCoord || - ca._y > optionalOnCanvas[i].getVisibleHeight()) { + ca._y > optionalOnCanvas[i].getVisibleHeight() - sequenceActivity.yCoord) { ca.activity.xCoord = (_xmouse - _canvasModel.getPosition().x) - (_canvasModel.getCanvas().taWidth/2); ca.activity.yCoord = (_ymouse - _canvasModel.getPosition().y) - (_canvasModel.getCanvas().taHeight/2); @@ -255,20 +260,13 @@ } if(selectedSequence != null) { - Debugger.log("ca " + ca.activity.activityUIID, Debugger.CRITICAL, "activityRelease", "CanvasController"); - ca.activity.orderID = _canvasModel.getCanvas().ddm.getNextSequenceOrderID(selectedSequence.activity.activityUIID); - Debugger.log("orderID " + _canvasModel.getCanvas().ddm.getNextSequenceOrderID(selectedSequence.activity.activityUIID), Debugger.CRITICAL, "activityRelease", "CanvasController"); if(ca.activity.orderID > 1) _canvasModel.createSequenceTransition(CanvasSequenceActivity(selectedSequence).lastActivity, ca.activity); else ComplexActivity(selectedSequence.activity).firstActivityUIID = ca.activity.activityUIID; _canvasModel.addParentToActivity(selectedSequence.activity.activityUIID, ca, false); - - Debugger.log("ca " + ca.activity.activityUIID, Debugger.CRITICAL, "activityRelease", "CanvasController"); - Debugger.log("orderID " + ca.activity.orderID, Debugger.CRITICAL, "activityRelease", "CanvasController"); - CanvasSequenceActivity(selectedSequence).updateChildren(); CanvasOptionalActivity(_canvasModel.activitiesDisplayed.get(selectedSequence.activity.parentUIID)).updateChildren(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -r0379c3c050496e1bd6fc6406ae13221ff11bc937 -rbcdab8016c59a648b9a9824d0451ac7cd8c55d2e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 0379c3c050496e1bd6fc6406ae13221ff11bc937) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision bcdab8016c59a648b9a9824d0451ac7cd8c55d2e) @@ -337,7 +337,8 @@ padlockClosed_mc._x = header_pnl._width + header_pnl._x - padlockClosed_mc._width - 5; padlockOpen_mc._x = padlockClosed_mc._x; } - + + _visibleHeight = container_pnl._height; _x = _activity.xCoord; _y = _activity.yCoord;