Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r6450bf811708b24965f20e3208ecd96a71d73155 -r034c8402e794d997946753746948357814143484 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r6450bf811708b24965f20e3208ecd96a71d73155 -r034c8402e794d997946753746948357814143484 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r2a7fa1966f852e166b00a49ee4bc84c992626932 -r034c8402e794d997946753746948357814143484 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 2a7fa1966f852e166b00a49ee4bc84c992626932) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 034c8402e794d997946753746948357814143484) @@ -122,7 +122,6 @@ mx.events.EventDispatcher.initialize(this); this._visible = false; - } /** @@ -308,7 +307,6 @@ complexViewer = content.createEmptyMovieClip("_complex_viewer_mc", DepthManager.kTop); branchContent = content.createEmptyMovieClip("_branch_content_mc", DepthManager.kTopmost); - setupConnectorHubs(); loadSequenceActivities(); @@ -341,13 +339,19 @@ var hubStartDir_x = (ApplicationParent.isRTL()) ? _endx : _startx; var hubEndDir_x = (ApplicationParent.isRTL()) ? _startx : _endx; + var startX:Number = (this.activity.startXCoord != null) ? this.activity.startXCoord : hubStartDir_x; + var startY:Number = (this.activity.startYCoord != null) ? this.activity.startYCoord : _starty; + + var endX:Number = (this.activity.endXCoord != null) ? this.activity.endXCoord : hubEndDir_x; + var endY:Number = (this.activity.endYCoord != null) ? this.activity.endYCoord : _endy; + // start-point connector hub - cHubStart_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _canvasController:getController(), _canvasBranchView:_canvasBranchView, _x: hubStartDir_x , _y: _starty, branchConnector:true}) + cHubStart_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _canvasController:getController(), _canvasBranchView:_canvasBranchView, _x: startX , _y: startY, branchConnector:true}) : activityLayer.createChildAtDepth("CanvasBranchingConnectorStart",DepthManager.kTop,{_activity: activity, _monitorController:getController(), _canvasBranchView:_canvasBranchView, _x: activity.startXCoord , _y: activity.startYCoord, branchConnector:true}); // end-point connector hub - cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: hubEndDir_x , _y: _endy, branchConnector:true}) + cHubEnd_mc = (model instanceof CanvasModel) ? activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _canvasController:CanvasController(getController()), _canvasBranchView:_canvasBranchView, _x: endX , _y: endY, branchConnector:true}) : activityLayer.createChildAtDepth("CanvasBranchingConnectorEnd",DepthManager.kTop,{_activity: activity, _monitorController:MonitorController(getController()), _canvasBranchView:_canvasBranchView, _x: activity.endXCoord , _y: activity.endYCoord, branchConnector:true}); - + this.onEnterFrame = hitConnectorHubs; } @@ -357,6 +361,9 @@ startHub.hit(); endHub.hit(); + + Debugger.log('start x:' + this.activity.startXCoord, Debugger.CRITICAL,' hitConnectorHubs','CanvasBranchView'); + } private function loadSequenceActivities() { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as =================================================================== diff -u -r5b44cd0646c0ee06e57059948a5d5f730040f431 -r034c8402e794d997946753746948357814143484 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 5b44cd0646c0ee06e57059948a5d5f730040f431) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as (.../CanvasActivity.as) (revision 034c8402e794d997946753746948357814143484) @@ -576,11 +576,9 @@ _canvasSize = _canvasModel.getSize(); if(_canvasBranchView.isStart(this)) { - Debugger.log('start branch:' + _canvasBranchView.activity.startXCoord + ":" + _canvasBranchView.activity.startYCoord, Debugger.CRITICAL,'draw','CanvasActivity'); _x = (_canvasBranchView.activity.startXCoord != null) ? _canvasBranchView.activity.startXCoord : _x; _y = (_canvasBranchView.activity.startYCoord != null) ? _canvasBranchView.activity.startYCoord : _y; } else if(_canvasBranchView.isEnd(this)) { - Debugger.log('end branch:' + _canvasBranchView.activity.endXCoord + ":" + _canvasBranchView.activity.endYCoord,Debugger.CRITICAL,'draw','CanvasActivity'); _x = (_canvasBranchView.activity.endXCoord != null) ? _canvasBranchView.activity.endXCoord : _x; _y = (_canvasBranchView.activity.endYCoord != null) ? _canvasBranchView.activity.endYCoord : _y; } @@ -712,7 +710,6 @@ } } - public function set isSetSelected(v:Boolean):Void{ _isSelected = v; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r14c9223586fcd9b7336ae6a8711558c44df089ec -r034c8402e794d997946753746948357814143484 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 14c9223586fcd9b7336ae6a8711558c44df089ec) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 034c8402e794d997946753746948357814143484) @@ -358,11 +358,11 @@ } else { if(_canvasModel.activeView.isStart(ca)) { - ca.activity.startXCoord = ca._x; - ca.activity.startYCoord = ca._y; + BranchingActivity(ca.activity).startXCoord = ca._x; + BranchingActivity(ca.activity).startYCoord = ca._y; } else if(_canvasModel.activeView.isEnd(ca)) { - ca.activity.endXCoord = ca._x; - ca.activity.endYCoord = ca._y; + BranchingActivity(ca.activity).endXCoord = ca._x; + BranchingActivity(ca.activity).endYCoord = ca._y; } } } else { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -r0a0b07f56c8dfab9f15de15e5bb0cb86f940b7fa -r034c8402e794d997946753746948357814143484 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 0a0b07f56c8dfab9f15de15e5bb0cb86f940b7fa) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 034c8402e794d997946753746948357814143484) @@ -381,37 +381,23 @@ private function addOptionalSequenceCA(ca:Object, nextOrPrevActivity:Activity, _dir:Number):Void { haltRefresh(true); - Debugger.log("ca: " + ca.activity.activityUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - var sequence:Activity = _cv.ddm.getActivityByUIID(nextOrPrevActivity.parentUIID); var transitionObj:Object = _cv.ddm.getTransitionsForActivityUIID(nextOrPrevActivity.activityUIID); var targetActivity:Activity = null; var transition:Transition = (_dir == 0) ? transitionObj.into : transitionObj.out; - Debugger.log("transition length: " + transitionObj.myTransitions.length, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); if(transition != null) { targetActivity = (_dir == 0) ? _cv.ddm.getActivityByUIID(transition.fromUIID) : _cv.ddm.getActivityByUIID(transition.toUIID); } else { if(_dir == 0) ComplexActivity(sequence).firstActivityUIID = ca.activity.activityUIID; } - Debugger.log("targetActivity order: " + targetActivity.orderID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - Debugger.log("transition toUIID: " + transition.toUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - Debugger.log("transition fromUIID: " + transition.fromUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - - Debugger.log("target UIID: " +targetActivity.activityUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - Debugger.log("nextOrPrevActivity: " + nextOrPrevActivity.activityUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - Debugger.log("direction: " + _dir, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - if(targetActivity != null) { var fromActivity:Activity = (_dir == 0) ? targetActivity : nextOrPrevActivity; var toActivity:Activity = (_dir == 0) ? nextOrPrevActivity : targetActivity; - Debugger.log("fromActivity: " + fromActivity.activityUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - Debugger.log("toActivity: " + toActivity.activityUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - _cv.ddm.removeTransition(transition.transitionUIID); createSequenceTransition(fromActivity, ca.activity); @@ -420,9 +406,6 @@ } else { var fromActivity:Activity = (_dir == 0) ? ca.activity : nextOrPrevActivity; var toActivity:Activity = (_dir == 0) ? nextOrPrevActivity : ca.activity; - - Debugger.log("fromActivity: " + fromActivity.activityUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); - Debugger.log("toActivity: " + toActivity.activityUIID, Debugger.CRITICAL, "addOptionalSequenceCA", "CanvasModel"); createSequenceTransition(fromActivity, toActivity); } @@ -581,8 +564,6 @@ /********************************************* * TODO: REQUIRE NORMAL BRANCH CLIENT_SIDE VALIDATION *********************************************/ - Debugger.log('fromAct: ' + fromAct + " toAct:" + toAct, Debugger.GEN,'addActivityToBranch','CanvasModel'); - if(!_cv.ddm.activities.containsKey(toAct)){ return new LFError(Dictionary.getValue('cv_trans_target_act_missing'),"addActivityToBranch",this); } @@ -707,8 +688,6 @@ return new LFError(Dictionary.getValue('cv_invalid_trans_circular_sequence'),"addActivityToTransition",this); } - Debugger.log('No validation errors, creating transition.......',Debugger.GEN,'addActivityToTransition','CanvasModel'); - //lets make the transition t = createTransition(_connectionActivities); @@ -770,8 +749,6 @@ sequences.sortOn("orderID", Array.NUMERIC); var orderID:Number = (sequences.length > 0) ? getHighestBranchNumber(b.sequenceActivity.parentUIID) : 0; - Debugger.log("sequences length (order id): " + orderID, Debugger.CRITICAL, "createBranchStartConnector", "CanvasModel"); - createNewSequenceActivity(activeView.activity, orderID+1, null, true); return b; @@ -827,10 +804,7 @@ } else if(_cv.ddm.getBranchesForActivityUIID(sequence.activityUIID).myBranches.length <= 0) { return new LFError("Cannot create end-branch connection to an unconnected Sequence.", "createBranchStartConnector", this); } else { - Debugger.log("looping: " + isLoopingLD(fromAct, _cv.ddm.getActivityByUIID(sequence.firstActivityUIID)), Debugger.CRITICAL, "createBranchStartConnector", "CanvasModel"); - var condition:Boolean = (sequence.firstActivityUIID != null && isLoopingLD(fromAct.activityUIID, sequence.firstActivityUIID)); - Debugger.log("condition: " + condition, Debugger.CRITICAL, "createBranchStartConnector", "CanvasModel"); if(condition || sequence.firstActivityUIID == fromAct.activityUIID) return new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_TO_END, fromAct.activityUIID, activeView.endHub.activity.activityUIID, sequence, _cv.ddm.learningDesignID); @@ -851,8 +825,6 @@ sequences.sortOn("orderID", Array.NUMERIC); var orderID:Number = (sequences.length > 0) ? getHighestBranchNumber(b.sequenceActivity.parentUIID) : 0; - Debugger.log("orderID: " + orderID, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel"); - createNewSequenceActivity(activeView.activity, orderID+1, null, true); return b; @@ -872,9 +844,6 @@ // move first activity var ca = _activitiesDisplayed.get(activityUIID); - Debugger.log("sequence uiid: " + sequence.activityUIID, Debugger.CRITICAL, "moveActivitiesToBranchSequence", "CanvasModel"); - Debugger.log("ca.activity.parentUIID: " + ca.activity.parentUIID, Debugger.CRITICAL, "moveActivitiesToBranchSequence", "CanvasModel"); - if(sequence.activityUIID != ca.activity.parentUIID) { addParentToActivity(sequence.activityUIID, ca, false); } else { @@ -888,15 +857,10 @@ if(transObj.out == null && branches.target != null) { if(branches.target.sequenceActivity.activityUIID != sequence.activityUIID && branches.target.direction == BranchConnector.DIR_TO_END) { - Debugger.log("end branch found: " + branches.target.branchUIID, Debugger.CRITICAL, "moveActivitiesToBranchSequence", "CanvasModel"); - Debugger.log("tar seq: " + branches.target.sequenceActivity.activityUIID + " = " + sequence.activityUIID, Debugger.CRITICAL, "moveActivitiesToBranchSequence", "CanvasModel"); - if(!branches.target.sequenceActivity.stopAfterActivity) { _cv.removeBranch(branches.target.branchUIID); MovieClipUtils.doLater(Proxy.create(this, moveBranchToSequence, activityUIID, sequence)); - - Debugger.log("stopAfterActivity: " + sequence.stopAfterActivity, Debugger.CRITICAL, "moveActivitiesToBranchSequence", "CanvasModel"); } } @@ -1060,11 +1024,9 @@ * @return */ public function openToolActivityContent(ta:ToolActivity):Void{ - Debugger.log('ta:'+ta.title+'toolContentID:'+ta.toolContentID+" and learningLibraryID: "+ta.learningLibraryID,Debugger.GEN,'openToolActivityContent','CanvasModel'); //check if we have a toolContentID - var defaultContentID:Number = Application.getInstance().getToolkit().getDefaultContentID(ta.learningLibraryID, ta.toolID); - Debugger.log('ta:'+ta.title+'toolContentID:'+ta.toolContentID+', default content ID:'+defaultContentID,Debugger.GEN,'openToolActivityContent','CanvasModel'); + if(ta.toolContentID == defaultContentID){ getNewToolContentID(ta); }else{ @@ -1080,8 +1042,6 @@ url = cfg.serverUrl+ta.authoringURL + '?toolContentID='+ta.toolContentID+'&contentFolderID='+ddm.contentFolderID; } - Debugger.log('Opening url:'+url,Debugger.GEN,'openToolActivityContent','CanvasModel'); - // TODO: Maybe add learningDesignID and serverURL to window title to handle multiple LAMS(s) running in same browser session. JsPopup.getInstance().launchPopupWindow(url, 'ToolActivityContent_' + ta.toolContentID, 600, 800, true, true, false, false, false); @@ -1096,32 +1056,26 @@ } public function getNewToolContentID(ta:ToolActivity):Void{ - Debugger.log('ta:'+ta.title+', activityUIID:'+ta.activityUIID,Debugger.GEN,'getNewToolContentID','CanvasModel'); var callback:Function = Proxy.create(this,setNewToolContentID,ta); Application.getInstance().getComms().getRequest('authoring/author.do?method=getToolContentID&toolID='+ta.toolID,callback, false); } public function setNewToolContentID(toolContentID:Number,ta:ToolActivity):Void{ Debugger.log('new content ID from server:'+toolContentID,Debugger.GEN,'setNewToolContentID','CanvasModel'); ta.toolContentID = toolContentID; - Debugger.log('ta:'+ta.title+',toolContentID:'+ta.toolContentID+', activityUIID:'+ta.activityUIID,Debugger.GEN,'setNewToolContentID','CanvasModel'); + openToolActivityContent(ta); } public function setDefaultToolContentID(ta:ToolActivity):Void{ ta.toolContentID = Application.getInstance().getToolkit().getDefaultContentID(ta.toolContentID,ta.toolID); - Debugger.log('ta:'+ta.title+',toolContentID:'+ta.toolContentID+', activityUIID:'+ta.activityUIID,Debugger.GEN,'setDefaultToolContentID','CanvasModel'); } public function openBranchActivityContent(ba, visible:Boolean):Void { currentBranchingActivity = ba; if(visible == null) visible = true; - Debugger.log("visible: " + visible, Debugger.CRITICAL, "openBranchActivityContent", "CanvasModel"); - Debugger.log("currentBranchingActivity UIID: " + currentBranchingActivity.activity.activityUIID, Debugger.CRITICAL, "openBranchActivityContent", "CanvasModel"); - Debugger.log("branchView: " + ba.activity.branchView, Debugger.CRITICAL, "openBranchActivityContent", "CanvasModel"); - if(BranchingActivity(ba.activity).clear) clearBranchingActivity(ba);