Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -rf080c872ce65a7e79203a01742894294056b9adc -r764fac63aac6ba73d6f561c09831cff02052c8d9 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision f080c872ce65a7e79203a01742894294056b9adc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 764fac63aac6ba73d6f561c09831cff02052c8d9) @@ -728,7 +728,7 @@ * @return */ private function removeTransition(t:Transition, cm){ - if(!cm.isActiveView(this)) return false; + if(!cm.isActiveView(this) || cm instanceof MonitorModel) return false; var r = cm.transitionsDisplayed.remove(t.transitionUIID); r.removeMovieClip(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -rbd335f35f0c2c71822e3b4360e18fa6a2196ec53 -r764fac63aac6ba73d6f561c09831cff02052c8d9 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision bd335f35f0c2c71822e3b4360e18fa6a2196ec53) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 764fac63aac6ba73d6f561c09831cff02052c8d9) @@ -494,8 +494,10 @@ ba.activity.branchView = branchView; var actToPush = monitorModel.getMonitor().ddm.getActivityByUIID(ba.activity.activityUIID); + Debugger.log("Pushing activity: "+actToPush.title+" to the stack", Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel"); Debugger.log("It has a UIID of: "+actToPush.activityUIID, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel"); + monitorModel.openBranchingActivities.push(ba.activity.activityUIID); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -r3160650bc3f6051ab417c4c78a5103cc7237cb8f -r764fac63aac6ba73d6f561c09831cff02052c8d9 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 3160650bc3f6051ab417c4c78a5103cc7237cb8f) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 764fac63aac6ba73d6f561c09831cff02052c8d9) @@ -1082,7 +1082,8 @@ if(ba.activity.branchView != null) { activeView = (visible) ? ba.activity.branchView : activeView; ba.activity.branchView.setOpen(visible); - ba.activity.branchView.open(); + ba.activity.branchView.open(); + setDirty(); } else { _monitor.openBranchView(currentBranchingActivity, visible); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -r3160650bc3f6051ab417c4c78a5103cc7237cb8f -r764fac63aac6ba73d6f561c09831cff02052c8d9 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 3160650bc3f6051ab417c4c78a5103cc7237cb8f) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 764fac63aac6ba73d6f561c09831cff02052c8d9) @@ -364,7 +364,7 @@ * @param activityUIID * @return */ - private function removeTransition(t:Transition,mm:MonitorModel){ + private function removeTransition(t:Transition, mm:MonitorModel){ if(!mm.isActiveView(this)) return false; var r = mm.transitionsDisplayed.remove(t.transitionUIID); @@ -402,8 +402,6 @@ newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity", DepthManager.kTop, {_activity:a, _children:children, _monitorController:mc, _monitorTabView:mtv, fromModuleTab:"monitorMonitorTab", learnerContainer:_learnerContainer_mc}); } else if(a.isBranchingActivity()){ a.branchView = null; - Debugger.log("setting branchView null: " + a.branchView,Debugger.CRITICAL,'drawActivity','MonitorTabView'); - newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity", DepthManager.kBottom, {_activity:a,_monitorController:mc, _monitorView:mtv, _module:"monitoring", learnerContainer:_learnerContainer_mc, setupBranchView:false}); } else { Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, it cannot be drawn',Debugger.CRITICAL,'drawActivity','MonitorTabView'); Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -ra3aa58df29bb561406f4c59971c1114cb06dffe8 -r764fac63aac6ba73d6f561c09831cff02052c8d9 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -ra3aa58df29bb561406f4c59971c1114cb06dffe8 -r764fac63aac6ba73d6f561c09831cff02052c8d9 Binary files differ