Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r976deca023b114ae00e73ad6583f6c8174b25372 -r9f7654858183353bddf5f412a2f23b386a9862cb Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r976deca023b114ae00e73ad6583f6c8174b25372 -r9f7654858183353bddf5f412a2f23b386a9862cb Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as =================================================================== diff -u -r976deca023b114ae00e73ad6583f6c8174b25372 -r9f7654858183353bddf5f412a2f23b386a9862cb --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 976deca023b114ae00e73ad6583f6c8174b25372) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as (.../CanvasOptionalActivity.as) (revision 9f7654858183353bddf5f412a2f23b386a9862cb) @@ -274,6 +274,10 @@ init(); } + + public function refresh():Void { + draw(); + } public function refreshChildren():Void { for(var i = 0; i < children_mc.length; i ++) { Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== diff -u -r031262744a76013a5fc13b63c4b42acb28db04fc -r9f7654858183353bddf5f412a2f23b386a9862cb --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 031262744a76013a5fc13b63c4b42acb28db04fc) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 9f7654858183353bddf5f412a2f23b386a9862cb) @@ -129,7 +129,8 @@ this.onEnterFrame = setupLabels; - this.tabChildren = true; + this.tabChildren = true; + setTabIndex(); hideAllSteppers(false); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -radc0dfff0e9b6456008da9b252defac5714ed4d1 -r9f7654858183353bddf5f412a2f23b386a9862cb --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision adc0dfff0e9b6456008da9b252defac5714ed4d1) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 9f7654858183353bddf5f412a2f23b386a9862cb) @@ -64,7 +64,8 @@ //Properties tab private var title_lbl:Label; - private var title_txt:TextInput; + private var title_txt:TextInput; + private var noselection_txt:TextInput; private var desc_lbl:Label; private var desc_txt:TextInput; private var piHeightHide:Number = 23; @@ -1264,23 +1265,20 @@ */ public function focusOut(e):Void{ var tgt:String = new String(e.target); - Debugger.log('focusOut tgt:'+tgt,Debugger.GEN,'focusOut','PropertyInspector'); - if(tgt.indexOf("title_txt") != -1){ //todo check if this is the right place to set edited content, should it be ddm? - _canvasModel.selectedItem.activity.title = title_txt.text; - + _canvasModel.selectedItem.activity.title = title_txt.text; } else if(tgt.indexOf("desc_txt") != -1){ - _canvasModel.selectedItem.activity.description= desc_txt.text; + _canvasModel.selectedItem.activity.description = desc_txt.text; } - + _canvasModel.selectedItem.refresh(); - if (_canvasModel.selectedItem.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE) + if (_canvasModel.selectedItem.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE) { _canvasModel.selectedItem.init(); - else if (_canvasModel.selectedItem.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || _canvasModel.selectedItem.activity.activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE) - _canvasModel.selectedItem.updateChildren(); - else if(_canvasModel.selectedItem instanceof BranchConnector) { + } else if (_canvasModel.selectedItem.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || _canvasModel.selectedItem.activity.activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE) { + //_canvasModel.selectedItem.updateChildren(); + } else if(_canvasModel.selectedItem instanceof BranchConnector) { if(_canvasModel.selectedItem.branch.isEnd) _canvasModel.branchesDisplayed.get(_canvasModel.getCanvas().ddm.getBranchesForActivityUIID(SequenceActivity(_canvasModel.selectedItem.branch.sequenceActivity).firstActivityUIID).target.branchUIID).updateBranchLabel(); else