Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r58b136ee2154e9b8bd117e30d06bcbb136819cdb -rd7fc49af08b521b8dedb73cac381576a96b6f853 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r58b136ee2154e9b8bd117e30d06bcbb136819cdb -rd7fc49af08b521b8dedb73cac381576a96b6f853 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as =================================================================== diff -u -r9403e74e1e757f31f8c8e932f746fdf377044a14 -rd7fc49af08b521b8dedb73cac381576a96b6f853 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision 9403e74e1e757f31f8c8e932f746fdf377044a14) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as (.../CanvasBranchView.as) (revision d7fc49af08b521b8dedb73cac381576a96b6f853) @@ -378,8 +378,10 @@ } - if(defaultSequenceActivity == null) - createInitialSequenceActivity(sequenceActs.length+1); + if(defaultSequenceActivity == null) { + var orderID:Number = model.getHighestBranchNumber(activity.activityUIID); + createInitialSequenceActivity(orderID+1); + } model.haltRefresh(false); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -rcf667999cbfc3396680b9ffed2589a27be564248 -rd7fc49af08b521b8dedb73cac381576a96b6f853 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision cf667999cbfc3396680b9ffed2589a27be564248) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision d7fc49af08b521b8dedb73cac381576a96b6f853) @@ -771,16 +771,46 @@ //b.setDefaultSequenceName(); sequences.sortOn("orderID", Array.NUMERIC); - var orderID:Number = (sequences.length > 0) ? sequences[sequences.length-1].orderID : 0; + 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; } } + + /** + * @usage gets the highest branch number for the current branching activities + * @param + * @return + */ + public function getHighestBranchNumber(branchParentUIID:Number):Number { + + var sequences:Array = _cv.ddm.getComplexActivityChildren(branchParentUIID); + var highestNum:Number = 0; + + for (var i=0; i highestNum) { + highestNum = branchNum; + } + } + + return highestNum; + } + + /** * @usage * @param transitionActs An array of transition activities. Must only contain 2 @@ -824,7 +854,7 @@ //b.setDefaultSequenceName(); sequences.sortOn("orderID", Array.NUMERIC); - var orderID:Number = (sequences.length > 0) ? sequences[sequences.length-1].orderID : 0; + var orderID:Number = (sequences.length > 0) ? getHighestBranchNumber(b.sequenceActivity.parentUIID) : 0; Debugger.log("orderID: " + orderID, Debugger.CRITICAL, "createActivitylessBranch", "CanvasModel");