Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as =================================================================== diff -u -r7a07722b14620a94c541b0c18f36172fb69a8ced -r2bd33062b90e26e11b9b980e5ea1ebef375ace2f --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 7a07722b14620a94c541b0c18f36172fb69a8ced) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as (.../MonitorController.as) (revision 2bd33062b90e26e11b9b980e5ea1ebef375ace2f) @@ -383,13 +383,15 @@ public function activityReleaseOutside(ca:Object):Void{ Debugger.log('activityReleaseOutside CanvasActivity:'+ca.activity.activityID,Debugger.GEN,'activityReleaseOutside','MonitorController'); } - + public function activityDoubleClick(ca:Object, forTabView:String, learnerID:Number, fromContextMenu:Boolean):Void{ Debugger.log("ca.activity.isBranchingActivity(): "+ca.activity.isBranchingActivity(), Debugger.GEN, "activityDoubleClick", "MonitorController"); if(ca.activity.isBranchingActivity() && !fromContextMenu) { - _monitorModel.openBranchActivityContent(ca, true); - } else { + if (_monitorModel.getSelectedTab() == MonitorTabView._tabID) + _monitorModel.openBranchActivityContent(ca, true); + } + if (!fromContextMenu){ var _learnerID:Number; var URLToSend:String; @@ -406,11 +408,11 @@ } if (forTabView == "MonitorTabViewLearner"){ - Debugger.log('activityDoubleClick CanvasActivity:'+ca.activityID,Debugger.GEN,'activityDoubleClick','MonitorController'); URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+ca.activityID+'&userID='+_learnerID+'&lessonID='+_root.lessonID; }else { URLToSend = _root.serverURL+_root.monitoringURL+'getLearnerActivityURL&activityID='+ca.activity.activityID+'&userID='+_learnerID+'&lessonID='+_root.lessonID; - } + } + Debugger.log('activityDoubleClick CanvasActivity:'+ca.activityID,Debugger.GEN,'activityDoubleClick','MonitorController'); } Debugger.log('Opening url (ca.activityID) :'+URLToSend+" Opening url (ca.activityID)"+URLToSend,Debugger.CRITICAL,'openToolActivityContent','MonitorModel'); Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r321dee644191cca6d9747c14c099f0546d9d1abb -r2bd33062b90e26e11b9b980e5ea1ebef375ace2f Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r321dee644191cca6d9747c14c099f0546d9d1abb -r2bd33062b90e26e11b9b980e5ea1ebef375ace2f Binary files differ