Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as =================================================================== diff -u -r69c442eb02e0be013812860d6d573f9c6d48c950 -r5c5d0dde4257f652d199b84921bf1182260bf959 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision 69c442eb02e0be013812860d6d573f9c6d48c950) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as (.../CanvasSequenceActivity.as) (revision 5c5d0dde4257f652d199b84921bf1182260bf959) @@ -155,6 +155,8 @@ if(_canvasController != null) _canvasModel = CanvasModel(_canvasController.getModel()); + else if(_monitorController != null) + mm = MonitorModel(_monitorController.getModel()); Debugger.log("firstActivityUIID: " + ComplexActivity(_activity).firstActivityUIID, Debugger.CRITICAL, "init", "CanvasSequenceActivity"); @@ -180,6 +182,7 @@ } var _newVisibleWidth:Number = (_children.length*CHILD_INCRE) + (CHILD_OFFSET_X*2) + 6; + if(_newVisibleWidth > CanvasSequenceActivity.TOOL_ACTIVITY_WIDTH) _visibleWidth = _newVisibleWidth; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as =================================================================== diff -u -r66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41 -r5c5d0dde4257f652d199b84921bf1182260bf959 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as (.../CanvasTransition.as) (revision 66768ec094a92cab9ef4bae8d55f6ea7aa7d8c41) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasTransition.as (.../CanvasTransition.as) (revision 5c5d0dde4257f652d199b84921bf1182260bf959) @@ -103,9 +103,9 @@ private function onRelease():Void{ if(!_doubleClicking){ - _canvasController.transitionRelease(this); + if(_canvasController != null) _canvasController.transitionRelease(this); + if(_monitorController != null) _monitorController.transitionRelease(this); } - } private function onReleaseOutside():Void{ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -rcd23d6049521a39924d08fcaf816e85f0a51c017 -r5c5d0dde4257f652d199b84921bf1182260bf959 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision cd23d6049521a39924d08fcaf816e85f0a51c017) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 5c5d0dde4257f652d199b84921bf1182260bf959) @@ -380,6 +380,11 @@ } } + public function transitionRelease(t:Object):Void { + Debugger.log('transitionRelease:'+t.transition.transitionUIID,Debugger.GEN,'transitionRelease','MonitorController'); + Debugger.log('toUIID:'+t.transition.toUIID + " fromUIID: " + t.transition.fromUIID,Debugger.CRITICAL,'transitionRelease','MonitorController'); + } + public function activityReleaseOutside(ca:Object):Void{ Debugger.log('activityReleaseOutside CanvasActivity:'+ca.activity.activityID,Debugger.GEN,'activityReleaseOutside','MonitorController'); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -rd065d513d8d620f940a0adb75935ebc5553cc276 -r5c5d0dde4257f652d199b84921bf1182260bf959 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision d065d513d8d620f940a0adb75935ebc5553cc276) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 5c5d0dde4257f652d199b84921bf1182260bf959) @@ -400,7 +400,7 @@ var actItems:Number = mm.activitiesDisplayed.size() if (actItems < mm.getActivityKeys().length && newActivity_mc != null){ - Debugger.log("adding to hashtable: " + newActivity_mc.activity.activityUIID, Debugger.CRITICAL, "drawActivity", "MonitorTabView"); + Debugger.log("adding to hashtable: " + newActivity_mc.activity.activityUIID, Debugger.CRITICAL, "drawActivity", "MonitorTabView"); mm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); } @@ -477,15 +477,18 @@ var mc = getController(); if(!isActivityOnLayer(mm.activitiesDisplayed.get(t.fromUIID), this.activityLayers) && !isActivityOnLayer(mm.activitiesDisplayed.get(t.toUIID), this.activityLayers)) return false; - + if(mm.transitionsDisplayed.containsKey(t.transitionUIID)) return false; + var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("CanvasTransition",DepthManager.kTop,{_transition:t,_monitorController:mc,_monitorTabView:mtv}); - var trnsItems:Number = mm.transitionsDisplayed.size() + var trnsItems:Number = mm.transitionsDisplayed.size(); + if (trnsItems < mm.getTransitionKeys().length){ - mm.transitionsDisplayed.put(t.transitionUIID,newTransition_mc); + mm.transitionsDisplayed.put(t.transitionUIID, newTransition_mc); } Debugger.log('drawn a transition:'+t.transitionUIID+','+newTransition_mc,Debugger.GEN,'drawTransition','MonitorTabView'); + return true; }