Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -ra36df8bbc3b9245e620cca61db706bc33bc727af -rb702dd3f3a7d6e7e5c8af1e240aee8e1ee2edeed Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -ra36df8bbc3b9245e620cca61db706bc33bc727af -rb702dd3f3a7d6e7e5c8af1e240aee8e1ee2edeed Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r0ab01b8b8bfbc35cb16b758be6b36c9af4091d3b -rb702dd3f3a7d6e7e5c8af1e240aee8e1ee2edeed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 0ab01b8b8bfbc35cb16b758be6b36c9af4091d3b) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision b702dd3f3a7d6e7e5c8af1e240aee8e1ee2edeed) @@ -190,10 +190,40 @@ LFMessage.showMessageAlert(msg); } else { Debugger.log("sequence based: " + optionalOnCanvas[i].activity.isSequenceBased, Debugger.CRITICAL, "activityRelease", "CanvasController"); + + var optionalX:Number = optionalOnCanvas[i].activity.xCoord; + var optionalY:Number = optionalOnCanvas[i].activity.yCoord; + var iconMouseX = _xmouse - _canvasModel.getPosition().x; + var iconMouseY = _ymouse - _canvasModel.getPosition().y; + if(optionalOnCanvas[i].activity.isSequenceBased) { + // test mouse ptr - var dropTarget:Object = eval(ca._droptarget); + var _children:Array = optionalOnCanvas[i].children; + var selectedSequence:MovieClip = null; + var mouseX = iconMouseX - optionalX; + var mouseY = iconMouseY - optionalY; + for(var j=0; j<_children.length; j++) { + if(mouseX >= _children[j].activity.xCoord && + mouseX <= (_children[j].activity.xCoord + _children[j]._width) && + mouseY >= _children[j].activity.yCoord && + mouseY <= (_children[j].activity.yCoord + _children[j]._height)) + selectedSequence = _children[j]; + } + + if(selectedSequence != null) { + _canvasModel.addParentToActivity(selectedSequence.activity.activityUIID, ca, false); + CanvasSequenceActivity(selectedSequence).updateChildren(); + CanvasOptionalActivity(_canvasModel.activitiesDisplayed.get(selectedSequence.activity.parentUIID)).updateChildren(); + } else { + activitySnapBack(ca); + var msg:String = Dictionary.getValue('activityDrop_optSequence_error_msg'); + LFMessage.showMessageAlert(msg); + } + + /**var dropTarget:Object = eval(ca._droptarget); + if(dropTarget._parent instanceof CanvasSequenceActivity) { _canvasModel.addParentToActivity(dropTarget._parent.activity.activityUIID, ca, false); CanvasSequenceActivity(dropTarget._parent).updateChildren(); @@ -202,6 +232,7 @@ var msg:String = Dictionary.getValue('activityDrop_optSequence_error_msg'); LFMessage.showMessageAlert(msg); } + */ } else { _canvasModel.addParentToActivity(optionalOnCanvas[i].activity.activityUIID, ca, false); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -rdee8f3e886e170f502a05d559769c4fff6cdf291 -rb702dd3f3a7d6e7e5c8af1e240aee8e1ee2edeed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision dee8f3e886e170f502a05d559769c4fff6cdf291) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision b702dd3f3a7d6e7e5c8af1e240aee8e1ee2edeed) @@ -230,7 +230,7 @@ public function updateChildren(newChildren:Array):Void { _visible = false; _visibleWidth = CONTAINER_PANEL_W; - _children = newChildren; + if(newChildren != null) _children = newChildren; init(); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as =================================================================== diff -u -r0ab01b8b8bfbc35cb16b758be6b36c9af4091d3b -rb702dd3f3a7d6e7e5c8af1e240aee8e1ee2edeed --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision 0ab01b8b8bfbc35cb16b758be6b36c9af4091d3b) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision b702dd3f3a7d6e7e5c8af1e240aee8e1ee2edeed) @@ -178,7 +178,7 @@ } - var _newVisibleWidth = (_children.length*CHILD_INCRE) + (CHILD_OFFSET_X*2) + 6; + var _newVisibleWidth:Number = (_children.length*CHILD_INCRE) + (CHILD_OFFSET_X*2) + 6; if(_newVisibleWidth > CanvasSequenceActivity.TOOL_ACTIVITY_WIDTH) _visibleWidth = _newVisibleWidth;