Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rf13f1ce2f5bc283548db73b31dc3d40d14518dce -raf26890a57ea13484e2f9e9acba607a320fe9724 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rf13f1ce2f5bc283548db73b31dc3d40d14518dce -raf26890a57ea13484e2f9e9acba607a320fe9724 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r8499a7e0ba9d82c35d27fa14f41428003fe427ce -raf26890a57ea13484e2f9e9acba607a320fe9724 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 8499a7e0ba9d82c35d27fa14f41428003fe427ce) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision af26890a57ea13484e2f9e9acba607a320fe9724) @@ -442,8 +442,8 @@ else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE){ var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID); - var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _canvasController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly()}) - : activityLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly(), fromModuleTab:fromModuleTab, learnerContainer:_learnerContainer_mc}); + var newActivity_mc = (_module != "monitoring") ? activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _canvasController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly()}) + : activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly(), fromModuleTab:fromModuleTab, learnerContainer:_learnerContainer_mc}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView'); @@ -519,7 +519,7 @@ * @return */ private function drawTransition(t:Transition, cm):Boolean{ - if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false; + if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayers) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false; var cbv = CanvasBranchView(this); var cbc = getController(); @@ -543,7 +543,7 @@ */ private function drawBranch(b:Branch, cm):Boolean{ - if(!isActivityOnLayer(cm.activitiesDisplayed.get(b.targetUIID), this.activityLayer)) + if(!isActivityOnLayer(cm.activitiesDisplayed.get(b.targetUIID), this.activityLayers)) if((b.direction == BranchConnector.DIR_SINGLE && b.targetUIID == activity.activityUIID)) continue; else return false; @@ -799,7 +799,6 @@ if(model instanceof CanvasModel) return CanvasModel(model).ddm else return MonitorModel(model).ddm; } - } \ No newline at end of file Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as =================================================================== diff -u -r853036d1bfb199ee42a2e1d785590509d4b3b9de -raf26890a57ea13484e2f9e9acba607a320fe9724 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision 853036d1bfb199ee42a2e1d785590509d4b3b9de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as (.../CanvasView.as) (revision af26890a57ea13484e2f9e9acba607a320fe9724) @@ -295,7 +295,7 @@ } else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE){ var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID); - var newActivity_mc = activityLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cvc,_canvasView:cvv,_locked:a.isReadOnly()}); + var newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cvc,_canvasView:cvv,_locked:a.isReadOnly()}); cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc); Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView'); } @@ -369,10 +369,10 @@ */ private function drawTransition(t:Transition,cm:CanvasModel):Boolean{ Debugger.log("drawing transition..." , Debugger.CRITICAL, "drawTransition", "CanvasVieW"); - Debugger.log("not activity on layer 1: " + !isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) , Debugger.CRITICAL, "drawTransition", "CanvasVieW"); - Debugger.log("not activity on layer 2: " + !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayer) , Debugger.CRITICAL, "drawTransition", "CanvasVieW"); + Debugger.log("not activity on layer 1: " + !isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayers) , Debugger.CRITICAL, "drawTransition", "CanvasVieW"); + Debugger.log("not activity on layer 2: " + !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayers) , Debugger.CRITICAL, "drawTransition", "CanvasVieW"); - if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false; + if(!isActivityOnLayer(cm.activitiesDisplayed.get(t.fromUIID), this.activityLayers) && !isActivityOnLayer(cm.activitiesDisplayed.get(t.toUIID), this.activityLayers)) return false; var cvv = CanvasView(this); var cvc = getController(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as =================================================================== diff -u -r853036d1bfb199ee42a2e1d785590509d4b3b9de -raf26890a57ea13484e2f9e9acba607a320fe9724 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision 853036d1bfb199ee42a2e1d785590509d4b3b9de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as (.../MonitorTabView.as) (revision af26890a57ea13484e2f9e9acba607a320fe9724) @@ -442,7 +442,7 @@ var mtv = MonitorTabView(this); var mc = getController(); - if(!isActivityOnLayer(mm.activitiesDisplayed.get(t.fromUIID), this.activityLayer) && !isActivityOnLayer(mm.activitiesDisplayed.get(t.toUIID), this.activityLayer)) return false; + if(!isActivityOnLayer(mm.activitiesDisplayed.get(t.fromUIID), this.activityLayers) && !isActivityOnLayer(mm.activitiesDisplayed.get(t.toUIID), this.activityLayers)) return false; var newTransition_mc:MovieClip = transitionLayer.createChildAtDepth("CanvasTransition",DepthManager.kTop,{_transition:t,_monitorController:mc,_monitorTabView:mtv}); Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as =================================================================== diff -u -rc82d1d71f00be6e302d869d9b7099363b509456f -raf26890a57ea13484e2f9e9acba607a320fe9724 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as (.../CommonCanvasView.as) (revision c82d1d71f00be6e302d869d9b7099363b509456f) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as (.../CommonCanvasView.as) (revision af26890a57ea13484e2f9e9acba607a320fe9724) @@ -237,8 +237,19 @@ _transparentCover_mc = a; } - public function isActivityOnLayer(a:MovieClip, layer:MovieClip) { - return (a._parent == layer); + public function isActivityOnLayer(a:MovieClip, layers:Array) { + for(var i=0; i