Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rac69d84da29ce386a9bab7c80bc5e247dfccb133 -r4bc848a9453ad7ee50f0c8dc41f058451ca5838e Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -rac69d84da29ce386a9bab7c80bc5e247dfccb133 -r4bc848a9453ad7ee50f0c8dc41f058451ca5838e Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as =================================================================== diff -u -r56d54fc59dd7b7a5824789949bfbcf8fe55851e2 -r4bc848a9453ad7ee50f0c8dc41f058451ca5838e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision 56d54fc59dd7b7a5824789949bfbcf8fe55851e2) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision 4bc848a9453ad7ee50f0c8dc41f058451ca5838e) @@ -1107,7 +1107,7 @@ if(target != null && target.direction == BranchConnector.DIR_SINGLE) { activityless = target; - break; + //break; } } } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -rbcf9450991007fe65f3b373b83da167905ba3fd0 -r4bc848a9453ad7ee50f0c8dc41f058451ca5838e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision bcf9450991007fe65f3b373b83da167905ba3fd0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 4bc848a9453ad7ee50f0c8dc41f058451ca5838e) @@ -313,7 +313,6 @@ if(SequenceActivity(sequenceActs[i]).activityUIID == activity.firstActivityUIID) { // (monitoring) entering this if statement - defaultSequenceActivity = SequenceActivity(sequenceActs[i]); model.addNewBranch(SequenceActivity(sequenceActs[i]), activity, true); } else { model.addNewBranch(SequenceActivity(sequenceActs[i]), activity, false); @@ -372,7 +371,9 @@ private function addSequence(a:SequenceActivity, cm:CanvasModel):Boolean{ if(a.parentUIID == activity.activityUIID) { - defaultSequenceActivity = a; + if(a.firstActivityUIID == null) + defaultSequenceActivity = a; + var sequenceObj = new Object(); sequenceObj.activity = a; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -rb0054257349ffef3a3cd82ecd30eb6e5b48ad953 -r4bc848a9453ad7ee50f0c8dc41f058451ca5838e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision b0054257349ffef3a3cd82ecd30eb6e5b48ad953) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 4bc848a9453ad7ee50f0c8dc41f058451ca5838e) @@ -904,6 +904,7 @@ var b:Branch = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_SINGLE, activeView.startHub.activity.activityUIID, null, activeView.defaultSequenceActivity, _cv.ddm.learningDesignID); SequenceActivity(b.sequenceActivity).isDefault = false; + Debugger.log("sequence: " + b.sequenceActivity.activityUIID, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel"); Debugger.log("isDefault: " + b.sequenceActivity.isDefault, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel"); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== diff -u -rc82d1d71f00be6e302d869d9b7099363b509456f -r4bc848a9453ad7ee50f0c8dc41f058451ca5838e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision c82d1d71f00be6e302d869d9b7099363b509456f) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 4bc848a9453ad7ee50f0c8dc41f058451ca5838e) @@ -613,6 +613,8 @@ } private function showBranchProperties(b:Branch){ + Debugger.log("branch sequence: " + b.sequenceActivity.activityUIID, Debugger.CRITICAL, "showBranchProperties", "PropertyInspector"); + toolDisplayName_lbl.text = ""+Dictionary.getValue('pi_title')+" - "+Dictionary.getValue('pi_activity_type_sequence', [Dictionary.getValue('branch_btn')]); title_txt.text = b.sequenceActivity.title;