Index: lams_central/web/lams_authoring.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v diff -u -r1.541 -r1.542 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v diff -u -r1.441 -r1.442 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as,v diff -u -r1.52 -r1.53 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as 22 Apr 2009 04:29:25 -0000 1.52 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as 13 May 2009 07:32:41 -0000 1.53 @@ -577,6 +577,7 @@ } else { maxAct_stp.value = ca.maxOptions; } + updateMinMaxOptionalData(); currentGrouping_lbl.text = "GroupingUIID:"+StringUtils.cleanNull(ca.runOffline.groupingUIID); } @@ -590,26 +591,32 @@ private function updateOptionalData(){ var oa = _canvasModel.selectedItem.activity; - var o = ComplexActivity(oa); - if(minAct_stp.value > CanvasOptionalActivity(_canvasModel.selectedItem).actChildren.length) - minAct_stp.value = CanvasOptionalActivity(_canvasModel.selectedItem).actChildren.length; + updateMinMaxOptionalData(); - if(maxAct_stp.value > CanvasOptionalActivity(_canvasModel.selectedItem).actChildren.length) - maxAct_stp.value = CanvasOptionalActivity(_canvasModel.selectedItem).actChildren.length; - - if(minAct_stp.value > maxAct_stp.value) - maxAct_stp.value = minAct_stp.value; - - o.minOptions = minAct_stp.value; - o.maxOptions = maxAct_stp.value; - var newChildren = _canvasModel.getCanvas().ddm.getComplexActivityChildren(oa.activityUIID); CanvasOptionalActivity(_canvasModel.selectedItem).updateChildren(newChildren); setModified(); } + private function updateMinMaxOptionalData() { + var selectedOptionalAct = ComplexActivity(_canvasModel.selectedItem.activity); + var numOptionalChildren:Number = _canvasModel.getCanvas().ddm.getComplexActivityChildren(selectedOptionalAct.activityUIID).length; + + if(minAct_stp.value > numOptionalChildren) + minAct_stp.value = numOptionalChildren; + + if(maxAct_stp.value > numOptionalChildren) + maxAct_stp.value = numOptionalChildren; + + if(minAct_stp.value > maxAct_stp.value) + maxAct_stp.value = minAct_stp.value; + + ComplexActivity(_canvasModel.selectedItem.activity).minOptions = minAct_stp.value; + ComplexActivity(_canvasModel.selectedItem.activity).maxOptions = maxAct_stp.value; + } + private function updateOptionalSequenceData(){ var controller = _canvasModel.activeView.getController(); if(!controller.isBusy) { @@ -630,13 +637,14 @@ private function removeSequenceItems(itemsToRemove:Array, overwrite:Boolean):Void { for(var i=0; i 0 && !overwrite) { - LFMessage.showMessageConfirm(Dictionary.getValue('pi_optSequence_remove_msg'), Proxy.create(this, removeSequenceItems, itemsToRemove, true), Proxy.create(this, onUpdateOptionalSequenceData), null, null, Dictionary.getValue('pi_optSequence_remove_msg_title')); - return; - } else { - _canvasModel.getCanvas().ddm.removeComplexActivity(itemsToRemove[i].activity.activityUIID, itemsToRemove[i].actChildren, true); - } + if(itemsToRemove[i].actChildren.length > 0 && !overwrite) { + LFMessage.showMessageConfirm(Dictionary.getValue('pi_optSequence_remove_msg'), Proxy.create(this, removeSequenceItems, itemsToRemove, true), Proxy.create(this, onUpdateOptionalSequenceData), null, null, Dictionary.getValue('pi_optSequence_remove_msg_title')); + return; + } else { + _canvasModel.getCanvas().ddm.removeComplexActivity(itemsToRemove[i].activity.activityUIID, itemsToRemove[i].actChildren, true); + } } + updateMinMaxOptionalData(); this.onEnterFrame = onUpdateOptionalSequenceData; }