Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as,v diff -u -r1.24 -r1.25 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as 6 Jun 2008 06:49:05 -0000 1.24 +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as 11 Jun 2008 03:02:20 -0000 1.25 @@ -401,7 +401,7 @@ removeAllChildrenAndInputComplex(children_mc[i].activity, children_mc[i].level, false); } - if(children_mc[i].activityStatus == "completed_mc") { + if(children_mc[i].activityStatus == "completed_mc" && isLearnerModule()) { if(children_mc[i].activity == activeSequence) removeAllChildrenAndInputSequence(activeSequence, false); else if(children_mc[i].activity == activeComplex) @@ -427,7 +427,9 @@ } } - if(closeBox && locked) { + if(closeBox && locked && isLearnerModule()) { + Debugger.log("closing: " + isLearnerModule(), Debugger.CRITICAL, "checkIfSequenceActive", "LearnerComplexActivity"); + collapse(); controller.complexActivityRelease(this, false); } @@ -446,19 +448,7 @@ children_mc = new Array(); delegates = new Array(); } - - /** TODO: Use for Sequence in Optional */ - /**private function removeAllChildrenAndLoadSequences(activity:Activity):Void { - activeSequence = null; - removeAllChildren(); - - children_mc = new Array(); - - createChildren(_children); - clearDelegates(); - }*/ - - /** TODO: Use for Sequence in Optional */ + public function removeAllChildrenAndInputSequence(activity:SequenceActivity, manualSelect:Boolean):Void { Debugger.log("activity: " + activity.activityUIID, Debugger.CRITICAL, "removeAllChildrenAndInputSequence", "LearnerComplexActivity"); Debugger.log("manual select: " + manualSelect, Debugger.CRITICAL, "removeAllChildrenAndInputSequence", "LearnerComplexActivity"); Index: lams_learning/web/lams_learner.swf =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v diff -u -r1.94 -r1.95 Binary files differ Index: lams_monitoring/web/lams_monitoring.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v diff -u -r1.205 -r1.206 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring_library.swf,v diff -u -r1.173 -r1.174 Binary files differ