Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r32e74a06368ce184623336939382aa9fc6e8a7aa -r4baf84f6228f1ae53dcbba937f4162825a1d6afb Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r32e74a06368ce184623336939382aa9fc6e8a7aa -r4baf84f6228f1ae53dcbba937f4162825a1d6afb Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r034c8402e794d997946753746948357814143484 -r4baf84f6228f1ae53dcbba937f4162825a1d6afb --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 034c8402e794d997946753746948357814143484) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 4baf84f6228f1ae53dcbba937f4162825a1d6afb) @@ -669,6 +669,11 @@ * @return */ private function drawTransition(t:Transition, cm):Boolean{ + Debugger.log('drawn a transition to:'+t.toUIID+', from:' + t.fromUIID, Debugger.CRITICAL, 'drawTransition', 'CanvasBranchView'); + + Debugger.log('test 1: '+ !isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayers), Debugger.CRITICAL, 'drawTransition', 'CanvasBranchView'); + Debugger.log('test 2: '+ !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayers), Debugger.CRITICAL, 'drawTransition', 'CanvasBranchView'); + if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayers) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayers)) return false; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r034c8402e794d997946753746948357814143484 -r4baf84f6228f1ae53dcbba937f4162825a1d6afb --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 034c8402e794d997946753746948357814143484) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 4baf84f6228f1ae53dcbba937f4162825a1d6afb) @@ -298,10 +298,13 @@ ca.activity.orderID = _canvasModel.getCanvas().ddm.getNextSequenceOrderID(selectedSequence.activity.activityUIID); Debugger.log("ca orderID: " + ca.activity.orderID, Debugger.CRITICAL, "activityRelease", "CanvasController"); + _canvasModel.haltRefresh(true); if(ca.activity.orderID > 1) _canvasModel.createSequenceTransition(CanvasSequenceActivity(selectedSequence).lastActivity, ca.activity); else ComplexActivity(selectedSequence.activity).firstActivityUIID = ca.activity.activityUIID; + _canvasModel.haltRefresh(false); + _canvasModel.addParentToActivity(selectedSequence.activity.activityUIID, ca, false); CanvasSequenceActivity(selectedSequence).updateChildren();