Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r172b9658e5c96ccf1fd7447ef4579237ccf9fde8 -rb365bfb0ceb516dcf01316100cf218de71fb324e Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r172b9658e5c96ccf1fd7447ef4579237ccf9fde8 -rb365bfb0ceb516dcf01316100cf218de71fb324e Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as =================================================================== diff -u -r9aab591f71aa913ad9b848d8cd406728c171470b -rb365bfb0ceb516dcf01316100cf218de71fb324e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as (.../Activity.as) (revision 9aab591f71aa913ad9b848d8cd406728c171470b) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as (.../Activity.as) (revision b365bfb0ceb516dcf01316100cf218de71fb324e) @@ -85,7 +85,7 @@ public static var OPTIONAL_ACTIVITY_TYPE:Number = 7; public static var SEQUENCE_ACTIVITY_TYPE:Number = 8; public static var SYSTEM_GATE_ACTIVITY_TYPE:Number = 9; - public static var CHOOSEN_BRANCHING_ACTIVITY_TYPE:Number = 10; + public static var CHOSEN_BRANCHING_ACTIVITY_TYPE:Number = 10; public static var GROUP_BRANCHING_ACTIVITY_TYPE:Number = 11; public static var TOOL_BRANCHING_ACTIVITY_TYPE:Number = 12; @@ -214,7 +214,7 @@ */ public static function getBranchingActivityTypes():Array{ var types:Array = []; - types.addItem({label: Dictionary.getValue('choosen_branch_act_lbl'), data: CHOOSEN_BRANCHING_ACTIVITY_TYPE}); + types.addItem({label: Dictionary.getValue('chosen_branch_act_lbl'), data: CHOSEN_BRANCHING_ACTIVITY_TYPE}); types.addItem({label: Dictionary.getValue('group_branch_act_lbl'), data: GROUP_BRANCHING_ACTIVITY_TYPE}); types.addItem({label: Dictionary.getValue('tool_branch_act_lbl'), data: TOOL_BRANCHING_ACTIVITY_TYPE}); return types; @@ -262,7 +262,7 @@ } public function isBranchingActivity():Boolean{ - if (_activityTypeID == CHOOSEN_BRANCHING_ACTIVITY_TYPE || + if (_activityTypeID == CHOSEN_BRANCHING_ACTIVITY_TYPE || _activityTypeID == GROUP_BRANCHING_ACTIVITY_TYPE || _activityTypeID == TOOL_BRANCHING_ACTIVITY_TYPE){ return true; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as =================================================================== diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -rb365bfb0ceb516dcf01316100cf218de71fb324e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision cd33f92df2c46dfe2e817281d501e179a6094637) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as (.../DesignDataModel.as) (revision b365bfb0ceb516dcf01316100cf218de71fb324e) @@ -465,7 +465,7 @@ _activities.put(newGroupActivity.activityUIID,newGroupActivity); - } else if(dto.activityTypeID == Activity.CHOOSEN_BRANCHING_ACTIVITY_TYPE || + } else if(dto.activityTypeID == Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE || dto.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE || dto.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE){ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as =================================================================== diff -u -r9cff9ef484b8a878642260d5417f1bb407c7f281 -rb365bfb0ceb516dcf01316100cf218de71fb324e --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision 9cff9ef484b8a878642260d5417f1bb407c7f281) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision b365bfb0ceb516dcf01316100cf218de71fb324e) @@ -595,7 +595,7 @@ if(_canvasModel.activeTool == CanvasModel.BRANCH_TOOL){ var p = new Point(_canvasModel.activeView.content._xmouse-(toolActWidth/2), _canvasModel.activeView.content._ymouse-(toolActHeight/2)); - _canvasModel.createNewBranchActivity(Activity.CHOOSEN_BRANCHING_ACTIVITY_TYPE,p,parent); + _canvasModel.createNewBranchActivity(Activity.CHOSEN_BRANCHING_ACTIVITY_TYPE,p,parent); _canvasModel.getCanvas().stopBranchTool(); _canvasModel.lastBranchActionType = CanvasModel.ADD_FROM_TEMPLATE;