Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -ra8c2b049ede9a3547e87cd943a4b63add2e00eae -re7d58455ba164aaacf47e088a304b2d7bea4e7ea Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -ra8c2b049ede9a3547e87cd943a4b63add2e00eae -re7d58455ba164aaacf47e088a304b2d7bea4e7ea Binary files differ Index: lams_flash/src/central/flash/lams_monitoring_v1.fla =================================================================== diff -u -rdf065b290b08acc5a6862622f4ffcd11339a229d -re7d58455ba164aaacf47e088a304b2d7bea4e7ea Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -rf8f41dead761de750c4b69041e2d3ee5d7605df2 -re7d58455ba164aaacf47e088a304b2d7bea4e7ea --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision f8f41dead761de750c4b69041e2d3ee5d7605df2) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision e7d58455ba164aaacf47e088a304b2d7bea4e7ea) @@ -214,7 +214,7 @@ setStyles(); - MovieClipUtils.doLater(Proxy.create(this,draw)); + MovieClipUtils.doLater(Proxy.create(this, draw)); } private function showAssets(isVisible:Boolean){ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as =================================================================== diff -u -rdf4415c542c1c0a7c354f57dfa032cadae3c3b8c -re7d58455ba164aaacf47e088a304b2d7bea4e7ea --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision df4415c542c1c0a7c354f57dfa032cadae3c3b8c) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision e7d58455ba164aaacf47e088a304b2d7bea4e7ea) @@ -105,7 +105,7 @@ _visibleHeight = container_pnl._height; _visibleWidth = container_pnl._width; - MovieClipUtils.doLater(Proxy.create(this,init)); + MovieClipUtils.doLater(Proxy.create(this, init)); } public function init():Void{ @@ -140,42 +140,48 @@ //so now it is placed on in the IDE and we just call init Debugger.log("fromModuleTab: " + fromModuleTab, Debugger.CRITICAL, "init", "CanvasParallelActivity"); + MovieClipUtils.doLater(Proxy.create(this, initChildren, child1, child2)); + + //let it wait one frame to set up the components. + MovieClipUtils.doLater(Proxy.create(this, draw)); + + } + + private function initChildren(child1:Activity, child2:Activity):Void { if(fromModuleTab == "monitorMonitorTab"){ Debugger.log("initialising for monitor: " + child1.activityUIID + " " + child2.activityUIID, Debugger.CRITICAL, "init", "CanvasParallelActivity"); Debugger.log("controller for monitor: " + _monitorController, Debugger.CRITICAL, "init", "CanvasParallelActivity"); //child1_mc = childActivities_mc.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:child1 ,_monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); //child2_mc = childActivities_mc.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:child2 ,_monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); + if(_canvasBranchView != null) { - child1_mc.init({activity:child1, _monitorController:_monitorController, _monitorView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer}); - child2_mc.init({activity:child2, _monitorController:_monitorController, _monitorView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer}); + CanvasActivity(child1_mc).init({activity:child1, _monitorController:_monitorController, _monitorView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer}); + CanvasActivity(child2_mc).init({activity:child2, _monitorController:_monitorController, _monitorView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer}); } else if(_canvasComplexView != null) { - child1_mc.init({activity:child1, _monitorController:_monitorController, _monitorView:_canvasComplexView, _module:"monitoring", learnerContainer:learnerContainer}); - child2_mc.init({activity:child2, _monitorController:_monitorController, _monitorView:_canvasComplexView, _module:"monitoring", learnerContainer:learnerContainer}); + CanvasActivity(child1_mc).init({activity:child1, _monitorController:_monitorController, _monitorView:_canvasComplexView, _module:"monitoring", learnerContainer:learnerContainer}); + CanvasActivity(child2_mc).init({activity:child2, _monitorController:_monitorController, _monitorView:_canvasComplexView, _module:"monitoring", learnerContainer:learnerContainer}); } else { - child1_mc.init({activity:child1, _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); - child2_mc.init({activity:child2, _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); + CanvasActivity(child1_mc).init({activity:child1, _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); + CanvasActivity(child2_mc).init({activity:child2, _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); } Debugger.log("child_mc(s) " + child1_mc + " " + child2_mc, Debugger.CRITICAL, "init", "CanvasParallelActivity"); - }else { + } else { + if(_canvasBranchView != null) { - child1_mc.init({activity:child1,_canvasController:_canvasController,_canvasBranchView:_canvasBranchView}); - child2_mc.init({activity:child2,_canvasController:_canvasController,_canvasBranchView:_canvasBranchView}); + CanvasActivity(child1_mc).init({activity:child1,_canvasController:_canvasController,_canvasBranchView:_canvasBranchView}); + CanvasActivity(child2_mc).init({activity:child2,_canvasController:_canvasController,_canvasBranchView:_canvasBranchView}); } else if(_canvasComplexView != null) { - child1_mc.init({activity:child1,_canvasController:_canvasController,_canvasComplexView:_canvasComplexView}); - child2_mc.init({activity:child2,_canvasController:_canvasController,_canvasComplexView:_canvasComplexView}); + CanvasActivity(child1_mc).init({activity:child1,_canvasController:_canvasController,_canvasComplexView:_canvasComplexView}); + CanvasActivity(child2_mc).init({activity:child2,_canvasController:_canvasController,_canvasComplexView:_canvasComplexView}); } else { - child1_mc.init({activity:child1,_canvasController:_canvasController,_canvasView:_canvasView}); - child2_mc.init({activity:child2,_canvasController:_canvasController,_canvasView:_canvasView}); + CanvasActivity(child1_mc).init({activity:child1,_canvasController:_canvasController,_canvasView:_canvasView}); + CanvasActivity(child2_mc).init({activity:child2,_canvasController:_canvasController,_canvasView:_canvasView}); } } - - //let it wait one frame to set up the components. - MovieClipUtils.doLater(Proxy.create(this,draw)); - } public function refreshChildren():Void { Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r067c9015b58a0a86faf7f60fd05bc27d32b02bf1 -re7d58455ba164aaacf47e088a304b2d7bea4e7ea Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r067c9015b58a0a86faf7f60fd05bc27d32b02bf1 -re7d58455ba164aaacf47e088a304b2d7bea4e7ea Binary files differ