Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r5a4655ca044bb9a9c1e79f161e1f80b4bae508ef -r6817b7f626d411edbc6c374b654121897af344b5 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r5a4655ca044bb9a9c1e79f161e1f80b4bae508ef -r6817b7f626d411edbc6c374b654121897af344b5 Binary files differ Index: lams_flash/src/central/flash/lams_authoring.fla =================================================================== diff -u -r898ec561f901223f8091a00d6891d027fbd95f9a -r6817b7f626d411edbc6c374b654121897af344b5 Binary files differ Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as =================================================================== diff -u -raf736b831960be1571e7fca3d5c37be09101a632 -r6817b7f626d411edbc6c374b654121897af344b5 --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as (.../WorkspaceDialog.as) (revision af736b831960be1571e7fca3d5c37be09101a632) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as (.../WorkspaceDialog.as) (revision 6817b7f626d411edbc6c374b654121897af344b5) @@ -714,7 +714,7 @@ * */ private function ok(){ - _global.breakpoint(); + _global.breakpoint(); _workspaceController = _workspaceView.getController(); _workspaceController.setBusy() @@ -775,6 +775,7 @@ */ private function saveFile(snode:XMLNode):Void{ Debugger.log('Saving a file.',Debugger.GEN,'saveFile','org.lamsfoundation.lams.WorkspaceDialog'); + ok_btn.enabled = false; var snodeData = treeview.selectedNode.attributes.data; var isWritable:Boolean = _workspaceModel.isWritableResource(snodeData.resourceType,snodeData.resourceID); @@ -784,12 +785,14 @@ if(StringUtils.containsReservedChar(resourceTitle_txi.text)) { LFMessage.showMessageAlert(Dictionary.getValue('ws_save_title_reserved_chars', [StringUtils.reserved_str]), null); + ok_btn.enabled = true; Cursor.showCursor(ApplicationParent.C_DEFAULT); return; } if(snode == treeview.dataProvider.firstChild){ LFMessage.showMessageAlert(Dictionary.getValue('ws_save_folder_invalid'),null); + ok_btn.enabled = true; } else if(snode.attributes.data.resourceType==_workspaceModel.RT_LD){ if(snode.parentNode != null) { @@ -798,36 +801,44 @@ if(isWritable) { //run a confirm dialogue as user is about to overwrite a design! - LFMessage.showMessageConfirm(Dictionary.getValue('ws_chk_overwrite_resource'), Proxy.create(this,doWorkspaceDispatch,true)); + LFMessage.showMessageConfirm(Dictionary.getValue('ws_chk_overwrite_resource'), Proxy.create(this,doWorkspaceDispatch,true), Proxy.create(this, enable_ok, true)); _workspaceController.clearBusy(); } - else // don't have permission, file is read-only + else { // don't have permission, file is read-only + ok_btn.enabled = true; LFMessage.showMessageAlert(Dictionary.getValue('ws_no_permission'),null,null) + } } - } } else if(snode.attributes.data.resourceType==_workspaceModel.RT_FOLDER){ if(snode.attributes.data.resourceID < 0){ + ok_btn.enabled = true; LFMessage.showMessageAlert(Dictionary.getValue('ws_save_folder_invalid'),null); _workspaceController.clearBusy(); } else if (!isWritable) { + ok_btn.enabled = true; LFMessage.showMessageAlert(Dictionary.getValue('ws_no_permission'),null,null); } else if(searchForFile(snode, resourceTitle_txi.text)){ //run a alert dialogue as user is using the same name as an existing design! + ok_btn.enabled = true; LFMessage.showMessageAlert(Dictionary.getValue('ws_chk_overwrite_existing', [resourceTitle_txi.text]), null); _workspaceController.clearBusy(); } - } else { LFMessage.showMessageAlert(Dictionary.getValue('ws_click_folder_file'),null); _workspaceController.clearBusy(); + ok_btn.enabled = true; } Cursor.showCursor(ApplicationParent.C_DEFAULT); } + private function enable_ok(e:Boolean) { + ok_btn.enabled = e; + } + private function searchForFile(snode:XMLNode, filename:String, isParentNode:Boolean){ var _isParentNode:Boolean = isParentNode; @@ -893,6 +904,7 @@ if(_workspaceModel.getWorkspaceResource('Folder_'+dto.workspaceFolderID)!=null){ if(_workspaceModel.currentMode == Workspace.MODE_SAVE || _workspaceModel.currentMode == Workspace.MODE_SAVEAS){ if(searchForFile(_workspaceModel.getWorkspaceResource('Folder_'+dto.workspaceFolderID), _resultDTO.resourceName)){ + ok_btn.enabled = true; //run a alert dialogue as user is using the same name as an existing design! LFMessage.showMessageAlert(Dictionary.getValue('ws_chk_overwrite_existing', [_resultDTO.resourceName]), null); _workspaceController.clearBusy() @@ -964,7 +976,7 @@ } public function closeThisDialogue(){ - close(); + close(); } /** @@ -1082,8 +1094,6 @@ _workspaceController.onTreeNodeChange(event); } - - /** * XML onLoad handler for treeview data