Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as =================================================================== diff -u -r5ebc04888c42799642c9249df906922db6af4450 -r279eb9923e590404e9eec790ee85645ca46e184e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 5ebc04888c42799642c9249df906922db6af4450) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as (.../CanvasParallelActivity.as) (revision 279eb9923e590404e9eec790ee85645ca46e184e) @@ -100,36 +100,34 @@ } public function init():Void{ - - - + //set up some handlers: clickTarget_mc.onPress = Proxy.create(this,localOnPress); clickTarget_mc.onRelease = Proxy.create(this,localOnRelease); clickTarget_mc.onReleaseOutside = Proxy.create(this,localOnReleaseOutside); - _ddm.getComplexActivityChildren(_activity.activityUIID); - showStatus(false); var child1:Activity; var child2:Activity; + if(_children[0].orderID < _children[1].orderID){ child1 = _children[0]; child2 = _children[1]; - }else{ child1 = _children[1]; child2 = _children[0]; - } + //set the positioning co-ords - newContainerXCoord = container_pnl._width/2 - newContainerYCoord = container_pnl._height/2 - child1.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X); - child1.yCoord = CHILD1_OFFSET_Y; - child2.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X); - child2.yCoord = CHILD2_OFFSET_Y //+ newContainerYCoord; + newContainerXCoord = container_pnl._width/2 + newContainerYCoord = container_pnl._height/2 + + child1.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X); + child1.yCoord = CHILD1_OFFSET_Y; + child2.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X); + child2.yCoord = CHILD2_OFFSET_Y //+ newContainerYCoord; + //so now it is placed on in the IDE and we just call init if (fromModuleTab == "monitorMonitorTab"){ child1_mc.init({activity:child1,_monitorController:_monitorController,_monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer}); @@ -141,7 +139,6 @@ } - //let it wait one frame to set up the components. MovieClipUtils.doLater(Proxy.create(this,draw)); Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as =================================================================== diff -u -rda1644d8e66121854689bf4c74caa46457502601 -r279eb9923e590404e9eec790ee85645ca46e184e --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision da1644d8e66121854689bf4c74caa46457502601) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision 279eb9923e590404e9eec790ee85645ca46e184e) @@ -258,10 +258,11 @@ static function get dialogue():MovieClip { //Return root if valid otherwise raise a big system error as app. will not work without it if(_instance.dialogueContainer != undefined) { - return _instance.dialogueContainer; + + return _instance.dialogueContainer; } else { //TODO DI 11/05/05 Raise error if mc hasn't been created - + Debugger.log("dialogue undefined: " + _instance, Debugger.CRITICAL, "dialogue", "ApplicationParent"); } } @@ -270,8 +271,8 @@ } public function get dialogueContainer():MovieClip { - Debugger.log("check application root: " + _appRoot_mc, Debugger.CRITICAL, "dialogueContainer", "ApplicationParent"); - if(_dialogueContainer_mc == undefined || _dialogueContainer_mc == null) _dialogueContainer_mc = _appRoot_mc.createEmptyMovieClip('_dialogueContainer_mc', DIALOGUE_DEPTH); + Debugger.log("check application root: " + _root, Debugger.CRITICAL, "dialogueContainer", "ApplicationParent"); + if(_dialogueContainer_mc == undefined || _dialogueContainer_mc == null) _dialogueContainer_mc = _root.createEmptyMovieClip('_dialogueContainer_mc', DIALOGUE_DEPTH); return _dialogueContainer_mc; } Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as =================================================================== diff -u -rf8e0c0e67f67bdcdf8ae8367b638c3775f7652de -r279eb9923e590404e9eec790ee85645ca46e184e --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision f8e0c0e67f67bdcdf8ae8367b638c3775f7652de) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision 279eb9923e590404e9eec790ee85645ca46e184e) @@ -33,7 +33,8 @@ import org.lamsfoundation.lams.learner.Application; import org.lamsfoundation.lams.monitoring.mv.MonitorController; import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView; -import org.lamsfoundation.lams.common.style. *; +import org.lamsfoundation.lams.common.style. *; + import mx.controls. *; import mx.managers. * /** @@ -98,13 +99,13 @@ complexActivity_mc = this; activeSequence = null; - _ddm = new DesignDataModel(); app = ApplicationParent.getInstance(); _visible = false; - _tm = ThemeManager.getInstance (); - _tip = new ToolTip(); + _tm = ThemeManager.getInstance(); + _tip = new ToolTip(); + _visibleHeight = container_pnl._height; _visibleWidth = container_pnl._width; Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -rf8e0c0e67f67bdcdf8ae8367b638c3775f7652de -r279eb9923e590404e9eec790ee85645ca46e184e Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -rf8e0c0e67f67bdcdf8ae8367b638c3775f7652de -r279eb9923e590404e9eec790ee85645ca46e184e Binary files differ