Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as,v diff -u -r1.18 -r1.19 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as 7 Dec 2007 02:18:16 -0000 1.18 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as 7 Jan 2008 07:54:16 -0000 1.19 @@ -551,14 +551,14 @@ _end_value_stp.visible = !evt.target.value; _condition_to_lbl.visible = !evt.target.value; - _opt_lessThan_cb.enabled = !evt.target.value; + _opt_lessThan_cb.selected = false;; } private function onLessThanSelect(evt:Object):Void { _end_value_stp.visible = !evt.target.value; _condition_to_lbl.visible = !evt.target.value; - _opt_greaterThan_cb.enabled = !evt.target.value; + _opt_greaterThan_cb.selected = false; } public static function getOutputType(type:String):String { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as,v diff -u -r1.28 -r1.29 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as 7 Dec 2007 05:56:38 -0000 1.28 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as 7 Jan 2008 07:54:16 -0000 1.29 @@ -466,14 +466,18 @@ private function showBranchingControls(v:Boolean, e:Boolean){ branchType_lbl.visible = v; branchType_cmb.visible = v; + hideAllSteppers(false); var _activityTypeID:Number = _canvasModel.selectedItem.activity.activityTypeID; if(_activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE) { + showGroupBasedBranchingControls(v, e); showAppliedGroupingControls(v, e); + } else if(_activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) { + showToolBasedBranchingControls(v, e); if(toolActs_cmb.visible) { @@ -1107,8 +1111,9 @@ private function showGroupBasedBranchingControls(v:Boolean, e:Boolean) { if(!v) { - _group_match_btn.visible = false; + _group_match_btn.visible = false; _define_monitor_cb.visible = false; + return; }