Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -rc5ce2369b6232db2c25a966f7873f695ebf6e485 -rf2894566dd80deaf0ac11226459a61a0b680e6fe --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision c5ce2369b6232db2c25a966f7873f695ebf6e485) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision f2894566dd80deaf0ac11226459a61a0b680e6fe) @@ -29,6 +29,7 @@ import org.lamsfoundation.lams.authoring.*; import org.lamsfoundation.lams.common.dict.*; import org.lamsfoundation.lams.common.mvc.*; +import org.lamsfoundation.lams.common.ApplicationParent; import org.lamsfoundation.lams.common.CommonCanvasView; import org.lamsfoundation.lams.monitoring.mv.MonitorModel; import org.lamsfoundation.lams.monitoring.mv.MonitorController; @@ -230,13 +231,15 @@ close_mc.onRelease = Proxy.create(this, localOnRelease); close_mc.onReleaseOutside = Proxy.create(this, localOnReleaseOutside); - + setupConnectorHubs(); loadSequenceActivities(); setStyles(); setSize(model); + //_open is consistently false in monitor + Debugger.log("_open: "+_open, Debugger.CRITICAL, "draw", "CanvasBranchView"); if(_open) { this._visible = true; @@ -657,21 +660,16 @@ */ public function getController():Object { var c:Controller = super.getController(); - /* Debugger.log("ApplicationParent.module: "+ApplicationParent.module, Debugger.CRITICAL,'getController','CanvasBranchView'); - if (ApplicationParent.module == "monitoring") { - Debugger.log("We are in the montioring module", Debugger.CRITICAL,'getController','CanvasBranchView'); + + if (ApplicationParent.getInstance().module == "monitoring") { + Debugger.log("We are in the monitoring module", Debugger.GEN,'getController','CanvasBranchView'); return MonitorController(c); } - else if (ApplicationParent.module == "authoring") { - Debugger.log("We are in the montioring module", Debugger.CRITICAL,'getController','CanvasBranchView'); + else { + Debugger.log("We are in the authoring module", Debugger.GEN,'getController','CanvasBranchView'); return CanvasController(c); } - else { - Debugger.log("Unkown module", Debugger.CRITICAL,'getController','CanvasBranchView'); - return null; - }*/ - return (c instanceof CanvasController) ? CanvasController(c) : MonitorController(c); } /** Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -rc5ce2369b6232db2c25a966f7873f695ebf6e485 -rf2894566dd80deaf0ac11226459a61a0b680e6fe --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision c5ce2369b6232db2c25a966f7873f695ebf6e485) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision f2894566dd80deaf0ac11226459a61a0b680e6fe) @@ -147,15 +147,21 @@ public function broadcastInit(){ dispatchEvent({type:'init',target:this}); } - private function viewLoaded(evt:Object){ Debugger.log('viewLoaded called',Debugger.GEN,'viewLoaded','Monitor'); - + if(evt.type=='load') { - if((monitorLockView != null || !locked) && monitorView != null) + + monitorModel.activeView = evt.target; + + if(evt.target instanceof CanvasBranchView) { + evt.target.open(); + monitorModel.setDirty(); + } else if((monitorLockView != null || !locked) && monitorView != null) { dispatchEvent({type:'load',target:this}); - }else { + } + } else { //Raise error for unrecognized event } } @@ -437,7 +443,7 @@ } public function openBranchView(ba, visible:Boolean){ - + var cx:Number = ba._x + ba.getVisibleWidth()/2; var cy:Number = ba._y + ba.getVisibleHeight()/2; var isVisible:Boolean = (visible == null) ? true : visible; @@ -448,11 +454,10 @@ //Add listener to view so that we know when it's loaded branchView.addEventListener('load', Proxy.create(this,viewLoaded)); - + monitorModel.addObserver(branchView); ba.branchView = branchView; - }