Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as =================================================================== diff -u -rbb2bee381467926d3e63726059a596df20659e6f -rae2ae6ffbf52cc9c75522c976f16fb9bcf8db198 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision bb2bee381467926d3e63726059a596df20659e6f) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as (.../LearnerComplexActivity.as) (revision ae2ae6ffbf52cc9c75522c976f16fb9bcf8db198) @@ -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 =================================================================== diff -u -rbb2bee381467926d3e63726059a596df20659e6f -rae2ae6ffbf52cc9c75522c976f16fb9bcf8db198 Binary files differ Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -rbb2bee381467926d3e63726059a596df20659e6f -rae2ae6ffbf52cc9c75522c976f16fb9bcf8db198 Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -rbb2bee381467926d3e63726059a596df20659e6f -rae2ae6ffbf52cc9c75522c976f16fb9bcf8db198 Binary files differ