Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r46ae388bae51125360faa1468cd0602de1d330e0 -r52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r46ae388bae51125360faa1468cd0602de1d330e0 -r52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as =================================================================== diff -u -r56d54fc59dd7b7a5824789949bfbcf8fe55851e2 -r52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as (.../SequenceActivity.as) (revision 56d54fc59dd7b7a5824789949bfbcf8fe55851e2) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as (.../SequenceActivity.as) (revision 52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8) @@ -23,6 +23,7 @@ import org.lamsfoundation.lams.authoring.*; import org.lamsfoundation.lams.common.Config; +import org.lamsfoundation.lams.common.util.Debugger; /* * This class represents the sequence activity. Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r78a478065bcef420535a21a44d8437fd7ad2cb47 -r52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 78a478065bcef420535a21a44d8437fd7ad2cb47) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8) @@ -181,7 +181,8 @@ setSize(_model); break; case 'ADD_SEQUENCE': - addSequence(event.data, _model); + var result = addSequence(event.data, _model); + Debugger.log("addSequence: " + result, Debugger.CRITICAL, "viewUpdate", "CanvasModel"); break; case 'DRAW_ACTIVITY_SEQ': drawActivity(event.data, _model); @@ -354,10 +355,18 @@ } private function addSequence(a:SequenceActivity, cm:CanvasModel):Boolean{ - if(a.parentUIID == activity.activityUIID) + if(a.parentUIID == activity.activityUIID) { defaultSequenceActivity = a; - else + var sequenceObj = new Object(); + sequenceObj.activity = a; + + cm.activitiesDisplayed.put(a.activityUIID, sequenceObj); + + } else { return false; + } + + Debugger.log("default sequence: " + defaultSequenceActivity.activityUIID, Debugger.CRITICAL, "addSequence", "CanvasBranchView"); return true; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -r46ae388bae51125360faa1468cd0602de1d330e0 -r52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 46ae388bae51125360faa1468cd0602de1d330e0) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 52ec15b45f4a95d5b34fc5117f4271b8ebdbecd8) @@ -945,8 +945,10 @@ if(_cv.ddm.getBranchesForActivityUIID(activeView.startHub.activity.activityUIID).activityless != null) return new LFError("Cannot add more than one Activityless branch.", null); - var b = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_SINGLE, activeView.startHub.activity.activityUIID, null, activeView.defaultSequenceActivity, _cv.ddm.learningDesignID); - b.sequenceActivity.isDefault = false; + 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"); createNewSequenceActivity(activeView.activity);