Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as
===================================================================
diff -u -re05aad774e5f4b57a72a689168d3c6e7391b4792 -r671b50bb9f03c1f507b621e842b619070d338d65
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	(.../LessonController.as)	(revision e05aad774e5f4b57a72a689168d3c6e7391b4792)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonController.as	(.../LessonController.as)	(revision 671b50bb9f03c1f507b621e842b619070d338d65)
@@ -21,14 +21,16 @@
  * ************************************************************************
  */
 
-import org.lamsfoundation.lams.learner.ls.*;
 import org.lamsfoundation.lams.common.LearnerComplexActivity;
 import org.lamsfoundation.lams.common.ApplicationParent;
-import org.lamsfoundation.lams.common.mvc.*
-import org.lamsfoundation.lams.common.util.*
-import org.lamsfoundation.lams.common.dict.*
-import org.lamsfoundation.lams.common.comms.Communication;
-import org.lamsfoundation.lams.learner.*
+import org.lamsfoundation.lams.common.comms.Communication;
+import org.lamsfoundation.lams.common.mvc.*;
+import org.lamsfoundation.lams.common.util.*;
+import org.lamsfoundation.lams.common.dict.*;
+
+import org.lamsfoundation.lams.learner.*;
+import org.lamsfoundation.lams.learner.ls.*;
+
 import org.lamsfoundation.lams.authoring.Activity;
 
 import mx.managers.*;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as
===================================================================
diff -u -r541d55b0149199f4ce28c91fa171d33d2350d268 -r671b50bb9f03c1f507b621e842b619070d338d65
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	(.../LessonView.as)	(revision 541d55b0149199f4ce28c91fa171d33d2350d268)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	(.../LessonView.as)	(revision 671b50bb9f03c1f507b621e842b619070d338d65)
@@ -252,22 +252,22 @@
 		
 		//take action depending on act type
 		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity() || (a.isBranchingActivity() && _root.mode != 'preview')){
-			newActivity_mc = _activityLayer_mc.attachMovie("LearnerActivity", "LearnerActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
+			newActivity_mc = _activityLayer_mc.attachMovie("LearnerActivity", "LearnerActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
 			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is tool/gate/group/branching activity',Debugger.CRITICAL,'drawActivity','LessonView');
 		} else if(a.isGateActivity()){
-			newActivity_mc = _activityLayer_mc.attachMovie("LearnerGateActivity", "LearnerGateActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
+			newActivity_mc = _activityLayer_mc.attachMovie("LearnerGateActivity", "LearnerGateActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
 		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE || (a.isBranchingActivity() && _root.mode == 'preview')){
 			//get the children
 			var children:Array = lm.learningDesignModel.getComplexActivityChildren(a.activityUIID);
 			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is is complex (parallel, optional, branching) activity',Debugger.CRITICAL,'drawActivity','LessonView');
 		
-			newActivity_mc = _activityLayer_mc.attachMovie("LearnerComplexActivity", "LearnerComplexActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, learner:lm.progressData});
+			newActivity_mc = _activityLayer_mc.attachMovie("LearnerComplexActivity", "LearnerComplexActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, learner:lm.progressData});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
 		} else if(a != null){
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, drawing default icon',Debugger.CRITICAL,'drawActivity','LessonView');
-			newActivity_mc = _activityLayer_mc.attachMovie("LearnerActivity", "LearnerActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
+			newActivity_mc = _activityLayer_mc.attachMovie("LearnerActivity", "LearnerActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
 		}
 		
@@ -418,6 +418,9 @@
 	 */
 	public function getController():LessonController{
 		var c:Controller = super.getController();
+		
+		Debugger.log("getting controller: " + LessonController(c), Debugger.CRITICAL, "getController", "LessonView");
+		
 		return LessonController(c);
 	}
 	
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as
===================================================================
diff -u -r7dc890bff120a4654b84393c17ba0fdcce2ee86d -r671b50bb9f03c1f507b621e842b619070d338d65
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 7dc890bff120a4654b84393c17ba0fdcce2ee86d)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 671b50bb9f03c1f507b621e842b619070d338d65)
@@ -303,17 +303,16 @@
 		hideToolTip();
 	}
 	
-	private function onPress():Void{
+	public function onPress():Void{
+			var c = (_controller instanceof LessonController) ? LessonController(_controller) : MonitorController(_controller);
 			
 			// check double-click
 			var now:Number = new Date().getTime();
 			
 			if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){
-				//if (app.controlKeyPressed != "transition"){
 					_doubleClicking = true;
-					controller.activityDoubleClick(this);
+					c.activityDoubleClick(this);
 					Debugger.log('DoubleClicking:+'+this,Debugger.GEN,'onPress','LearnerActivity');
-				//}
 			}else{
 				Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','LearnerActivity');
 				_doubleClicking = false;
@@ -326,7 +325,9 @@
 	}
 	
 	
-	private function onRelease():Void{
+	public function onRelease():Void{
+		var c = (_controller instanceof LessonController) ? LessonController(_controller) : MonitorController(_controller);
+			
 		if(!_doubleClicking){
 			Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','LearnerActivity');
 			Debugger.log('Is sequence:'+this.activity.isSequenceActivity(),Debugger.GEN,'onRelease','LearnerActivity');
@@ -366,12 +367,12 @@
 					}
 				}
 				
-				controller.activityRelease(this);
+				c.activityRelease(this);
 		}
 		
 	}
 	
-	private function onReleaseOutside():Void{
+	public function onReleaseOutside():Void{
 		Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','LearnerActivity');
 		
 		controller.activityReleaseOutside(this);
@@ -381,12 +382,8 @@
 		learner = a;
 	}
 	
-	public function get controller(){
-		if(app.module == 'learner'){
-			return LessonController(_controller);
-		} else {
-			return MonitorController(_controller);
-		}
+	public function set controller(a:AbstractController){
+		_controller = a;
 	}
 	
 	public function get model(){
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
diff -u -rf1fe998bb39b35f1309e3dc23c5926a8001fa661 -r671b50bb9f03c1f507b621e842b619070d338d65
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision f1fe998bb39b35f1309e3dc23c5926a8001fa661)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 671b50bb9f03c1f507b621e842b619070d338d65)
@@ -644,8 +644,12 @@
 		return a;
 	}
 	
+	public function set controller(a:AbstractController){
+		_controller = a;
+	}
+	
 	public function get controller(){
-		if(isLearnerModule()){
+		if(_controller instanceof LessonController){
 			return LessonController(_controller);
 		} else {
 			return MonitorController(_controller);
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r7dc890bff120a4654b84393c17ba0fdcce2ee86d -r671b50bb9f03c1f507b621e842b619070d338d65
Binary files differ
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rdf065b290b08acc5a6862622f4ffcd11339a229d -r671b50bb9f03c1f507b621e842b619070d338d65
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rdf065b290b08acc5a6862622f4ffcd11339a229d -r671b50bb9f03c1f507b621e842b619070d338d65
Binary files differ