Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r1d2fae09fa3447fdd476a8560cd8bf3ff257522e -rd6b0e9aab86f9c21bfdab4b2715ac854a0be21b6 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r1d2fae09fa3447fdd476a8560cd8bf3ff257522e -rd6b0e9aab86f9c21bfdab4b2715ac854a0be21b6 Binary files differ Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as =================================================================== diff -u -rfab349e06b84c920af8cef909f78d71fe4268459 -rd6b0e9aab86f9c21bfdab4b2715ac854a0be21b6 --- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as (.../WorkspaceDialog.as) (revision fab349e06b84c920af8cef909f78d71fe4268459) +++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as (.../WorkspaceDialog.as) (revision d6b0e9aab86f9c21bfdab4b2715ac854a0be21b6) @@ -825,8 +825,12 @@ if(snode == treeview.dataProvider.firstChild){ LFMessage.showMessageAlert(Dictionary.getValue('ws_save_folder_invalid'),null); } else if(snode.attributes.data.resourceType==_workspaceModel.RT_LD){ - //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)); + if(snode.parentNode != null) { + if(searchForFile(snode.parentNode, resourceTitle_txi.text, true)) { + //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)); + } + } _workspaceController.clearBusy(); } else if(snode.attributes.data.resourceType==_workspaceModel.RT_FOLDER){ if(snode.attributes.data.resourceID < 0){ @@ -841,10 +845,15 @@ LFMessage.showMessageAlert(Dictionary.getValue('ws_click_folder_file'),null); _workspaceController.clearBusy(); } + Cursor.showCursor(ApplicationParent.C_DEFAULT); } - private function searchForFile(snode:XMLNode, filename:String){ + private function searchForFile(snode:XMLNode, filename:String, nodeIsParent:Boolean){ + + var _nodeIsParent = nodeIsParent; + if(_nodeIsParent == null) { _nodeIsParent = false; } + Debugger.log('Searching for file (' + snode.childNodes.length + '): ' + filename,Debugger.GEN,'openFile','org.lamsfoundation.lams.WorkspaceDialog'); var cnode:XMLNode; @@ -872,7 +881,7 @@ } while(cnode != null); if(_workspaceModel.currentMode == Workspace.MODE_SAVE || _workspaceModel.currentMode == Workspace.MODE_SAVEAS){ - doWorkspaceDispatch(false); + doWorkspaceDispatch(nodeIsParent); } return false;