Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r4eee1b7df217e818be817e5d400e6f590e3b9d74 -r7fb6b41326c14398bde6d88690e65ebd166a1e44 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r4eee1b7df217e818be817e5d400e6f590e3b9d74 -r7fb6b41326c14398bde6d88690e65ebd166a1e44 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r4eee1b7df217e818be817e5d400e6f590e3b9d74 -r7fb6b41326c14398bde6d88690e65ebd166a1e44 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 4eee1b7df217e818be817e5d400e6f590e3b9d74) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 7fb6b41326c14398bde6d88690e65ebd166a1e44) @@ -383,6 +383,8 @@ public function localOnRelease():Void{ Debugger.log("close called", Debugger.CRITICAL, "localOnRelease", "CanvasBranchView"); + + model.closeAllComplexViews(); close(); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as =================================================================== diff -u -r47545d87ebe3a0fde51c85720b8e0693ad471843 -r7fb6b41326c14398bde6d88690e65ebd166a1e44 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as (.../CanvasSuperModel.as) (revision 47545d87ebe3a0fde51c85720b8e0693ad471843) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as (.../CanvasSuperModel.as) (revision 7fb6b41326c14398bde6d88690e65ebd166a1e44) @@ -947,6 +947,12 @@ setDirty(); } + public function closeAllComplexViews():Void { + while(activeView instanceof CanvasComplexView) { + CanvasComplexView(activeView).close(); + } + } + public function getCoords(ca:Activity, o:Object):Object { var obj:Object = (o != null) ? o : new Object(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -re20a7858297a1f13e50e5c923019c2d04787c665 -r7fb6b41326c14398bde6d88690e65ebd166a1e44 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision e20a7858297a1f13e50e5c923019c2d04787c665) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 7fb6b41326c14398bde6d88690e65ebd166a1e44) @@ -31,7 +31,8 @@ import org.lamsfoundation.lams.authoring.GateActivity; import org.lamsfoundation.lams.authoring.DesignDataModel; import org.lamsfoundation.lams.authoring.SequenceActivity; -import org.lamsfoundation.lams.authoring.br.BranchConnector; +import org.lamsfoundation.lams.authoring.br.BranchConnector; +import org.lamsfoundation.lams.authoring.cv.CanvasComplexView; import org.lamsfoundation.lams.common.Sequence; import org.lamsfoundation.lams.common.util.Observable; import org.lamsfoundation.lams.common.util.*; @@ -766,6 +767,12 @@ return orderedActivityArr; } + public function closeAllComplexViews():Void { + while(activeView instanceof CanvasComplexView) { + CanvasComplexView(activeView).close(); + } + } + /** * get the design in the DesignDataModel and update the Monitor Model accordingly. * NOTE: Design elements are added to the DDM here.