Changeset 2082

Timestamp:

08/14/12 13:26:16 (12 years ago)

Author:

twagoo

Message:

Checking for pending changes not when switching to editor but when cancelling editing

Location:

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry

Files:

• common/components/RegistryViewStack.as (modified) (1 diff)
• editor/EditorAS.as (modified) (2 diffs)

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/common/components/RegistryViewStack.as

@@ -78 +78 @@
                 
                 public function switchToEditor(itemDescription:ItemDescription):void {
-                        // About to open item in editor, check if there are pending changes
-                        if(itemDescription != null && editor.xmlEditor.specHasChanges){
-                                Alert.show("Doing this will discard all changes in the component that is currently being edited. Proceed?", "Discard changes", Alert.OK|Alert.CANCEL, this, 
-                                        function(event:CloseEvent):void {
-                                                if(event.detail == Alert.OK) {
-                                                        doSwitchToEditor(itemDescription);
-                                                }
-                                        } );
-                        } else {
-                                doSwitchToEditor(itemDescription);
-                        }
+                        doSwitchToEditor(itemDescription);
                 }
                 

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/EditorAS.as

@@ -136 +136 @@
 
 private function cancel():void {
-        Alert.show("Are you sure you want to cancel editing?", "Cancel editing", Alert.YES|Alert.NO, null, 
+        if(xmlEditor.specHasChanges){
+        Alert.show("There are pending changes. Cancelling will discard these. Are you sure you want to proceed?", "Discard changes?", Alert.YES|Alert.NO, null, 
                 function (eventObj:CloseEvent):void{
                         if(eventObj.detail == Alert.YES){
@@ -142 +143 @@
                         }
                 });
+        } else {
+                viewStack.switchToBrowse(itemDescription);
+        }
 }