Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -rfdb001148922ea9c0662f9e91fa9e2ee68b23845 -r550e6eb2fd62aa4e722ae7fd6a9f274aa36c4dae --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision fdb001148922ea9c0662f9e91fa9e2ee68b23845) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 550e6eb2fd62aa4e722ae7fd6a9f274aa36c4dae) @@ -485,7 +485,7 @@ var isVisible:Boolean = (visible == null) ? true : visible; var target:MovieClip = monitorModel.activeView.branchContent; - var _branchView_mc:MovieClip = target.createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible}); + var _branchView_mc:MovieClip = target.createChildAtDepth("canvasBranchView", DepthManager.kTop, {_x: cx, _y: cy, _canvasBranchingActivity:ba, _open:isVisible, _prevActiveView: monitorModel.activeView}); var branchView:CanvasBranchView = CanvasBranchView(_branchView_mc); branchView.init(monitorModel, monitorView.getController()); @@ -504,14 +504,18 @@ monitorModel.openBranchingActivities.push(ba.activity.activityUIID); } - public function closeBranchView() { + public function closeBranchView(prevActiveView) { var parentBranching:CanvasActivity = null; var isCBV:Boolean = false; if(monitorModel.activeView.activity.parentUIID != null) parentBranching = CanvasActivity(monitorModel.activitiesDisplayed.get(_ddm.getActivityByUIID(monitorModel.activeView.activity.parentUIID).parentUIID)); - monitorModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.activity.branchView : monitorView.getMonitorTabView(); + if(prevActiveView != null) + monitorModel.activeView = prevActiveView; + else + monitorModel.activeView = (parentBranching.activity.isBranchingActivity()) ? parentBranching.activity.branchView : monitorView.getMonitorTabView(); + monitorModel.currentBranchingActivity = (parentBranching.activity.isBranchingActivity()) ? parentBranching : null; var poppedActivityUIID:Number = monitorModel.openBranchingActivities.pop(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -r764fac63aac6ba73d6f561c09831cff02052c8d9 -r550e6eb2fd62aa4e722ae7fd6a9f274aa36c4dae --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 764fac63aac6ba73d6f561c09831cff02052c8d9) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 550e6eb2fd62aa4e722ae7fd6a9f274aa36c4dae) @@ -1080,6 +1080,7 @@ Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "MonitorModel"); if(ba.activity.branchView != null) { + ba.activity.branchView.prevActiveView = activeView; activeView = (visible) ? ba.activity.branchView : activeView; ba.activity.branchView.setOpen(visible); ba.activity.branchView.open(); Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r4ad1a326ee8a1cfcd2fa35794fe0659f5a93a13a -r550e6eb2fd62aa4e722ae7fd6a9f274aa36c4dae Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r4ad1a326ee8a1cfcd2fa35794fe0659f5a93a13a -r550e6eb2fd62aa4e722ae7fd6a9f274aa36c4dae Binary files differ