better Save button detection

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index 09f18f950bb3807f0aa1cbb502ddf010a739a858..13a9914ab68a08b47a9b88de0bc0af526cb2967f 100755 (executable)
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -57,6 +57,8 @@ package net.systemeD.halcyon.connection {
         public static var LOAD_COMPLETED:String = "load_completed";
         public static var SAVE_STARTED:String = "save_started";
         public static var SAVE_COMPLETED:String = "save_completed";
+        public static var DATA_DIRTY:String = "data_dirty";
+        public static var DATA_CLEAN:String = "data_clean";
         public static var NEW_CHANGESET:String = "new_changeset";
         public static var NEW_CHANGESET_ERROR:String = "new_changeset_error";
         public static var NEW_NODE:String = "new_node";
@@ -89,6 +91,7 @@ package net.systemeD.halcyon.connection {
         private var relations:Object = {};
         private var pois:Array = [];
         private var changeset:Changeset = null;
+               private var modified:Boolean = false;
                public var nodecount:int=0;
                public var waycount:int=0;
                public var relationcount:int=0;
@@ -228,18 +231,21 @@ package net.systemeD.halcyon.connection {
         public function createNode(tags:Object, lat:Number, lon:Number, performCreate:Function):Node {
             var node:Node = new Node(nextNegative, 0, tags, true, lat, lon);
             performCreate(new CreateEntityAction(node, setNode));
+                       markDirty();
             return node;
         }
 
         public function createWay(tags:Object, nodes:Array, performCreate:Function):Way {
             var way:Way = new Way(nextNegative, 0, tags, true, nodes.concat());
             performCreate(new CreateEntityAction(way, setWay));
+                       markDirty();
             return way;
         }
 
         public function createRelation(tags:Object, members:Array, performCreate:Function):Relation {
             var relation:Relation = new Relation(nextNegative, 0, tags, true, members.concat());
             performCreate(new CreateEntityAction(relation, setRelation));
+                       markDirty();
             return relation;
         }
 
@@ -305,6 +311,18 @@ package net.systemeD.halcyon.connection {
                        // ** should purge POIs and relations too
                }
 
+               public function markDirty():void {
+            if (!modified) { dispatchEvent(new Event(DATA_DIRTY)); }
+                       modified=true;
+               }
+               public function markClean():void {
+            if (modified) { dispatchEvent(new Event(DATA_CLEAN)); }
+                       modified=false;
+               }
+               public function get isDirty():Boolean {
+                       return modified;
+               }
+
         // these are functions that the Connection implementation is expected to
         // provide. This class has some generic helpers for the implementation.
                public function loadBbox(left:Number, right:Number,

diff --git a/net/systemeD/halcyon/connection/MainUndoStack.as b/net/systemeD/halcyon/connection/MainUndoStack.as
index 4e7fdb7724148efaf2f792e8de213d88b26fd42e..b302b2182c87cb42b04b1e3a283ec1b05e1ef9a9 100644 (file)
--- a/net/systemeD/halcyon/connection/MainUndoStack.as
+++ b/net/systemeD/halcyon/connection/MainUndoStack.as
@@ -36,8 +36,11 @@ package net.systemeD.halcyon.connection {
                 if ( undoActions.length > 0 ) {
                     var previous:UndoableAction = undoActions[undoActions.length - 1];
                     var isMerged:Boolean = action.mergePrevious(previous);
-                    if ( isMerged )
+                    if ( isMerged ) {
+                                               UndoableEntityAction(action).wasDirty = UndoableEntityAction(previous).wasDirty;
+                                               UndoableEntityAction(action).connectionWasDirty = UndoableEntityAction(previous).connectionWasDirty;
                         undoActions.pop();
+                                       }
                 }
                 undoActions.push(action);
                 redoActions = [];

diff --git a/net/systemeD/halcyon/connection/UndoableEntityAction.as b/net/systemeD/halcyon/connection/UndoableEntityAction.as
index 0dc9cfc6e1d87804d69ea3ed40d89236fcacd11c..2f5d1f97244711335099d9a34845f530f4639f61 100644 (file)
--- a/net/systemeD/halcyon/connection/UndoableEntityAction.as
+++ b/net/systemeD/halcyon/connection/UndoableEntityAction.as
@@ -1,7 +1,8 @@
 package net.systemeD.halcyon.connection {
 
     public class UndoableEntityAction extends UndoableAction {
-        private var wasDirty:Boolean;
+        public var wasDirty:Boolean;
+               public var connectionWasDirty:Boolean;
         protected var name:String;
         protected var entity:Entity;
             
@@ -11,14 +12,23 @@ package net.systemeD.halcyon.connection {
         }
             
         protected function markDirty():void {
+                       var conn:Connection = Connection.getConnectionInstance();
             wasDirty = entity.isDirty;
+                       connectionWasDirty = conn.isDirty;
+
             if ( !wasDirty )
                 entity.markDirty();
+
+            if ( !connectionWasDirty )
+                conn.markDirty();
         }
             
         protected function markClean():void {
             if ( !wasDirty )
                 entity.markClean(entity.id, entity.version);
+
+            if ( !connectionWasDirty )
+                Connection.getConnectionInstance().markClean();
         }
             
         public function toString():String {

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index 0da95613377ad0eeb740afb0feef7b977ad9841d..95fcb7d6368fa8168d34f60f7258f3d785ffd0bc 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -178,6 +178,7 @@ package net.systemeD.halcyon.connection {
             }
 
                dispatchEvent(new SaveCompleteEvent(SAVE_COMPLETED, true));
+               dispatchEvent(new Event(DATA_CLEAN, true));
         }
 
         private function diffUploadError(event:IOErrorEvent):void {

diff --git a/net/systemeD/halcyon/connection/actions/MoveNodeAction.as b/net/systemeD/halcyon/connection/actions/MoveNodeAction.as
index 63768d13be34f6ab2fcfeba34ccbef181091fc04..f918d78fef5b07505d55455ad6ba050f762be5c3 100644 (file)
--- a/net/systemeD/halcyon/connection/actions/MoveNodeAction.as
+++ b/net/systemeD/halcyon/connection/actions/MoveNodeAction.as
@@ -36,7 +36,7 @@ package net.systemeD.halcyon.connection.actions {
             
         public override function undoAction():uint {
             setLatLon(oldLat, oldLon);
-            markDirty();
+            markClean();
             entity.dispatchEvent(new NodeMovedEvent(Connection.NODE_MOVED, Node(entity), newLat, newLon));
             return SUCCESS;
         }

diff --git a/potlatch2.mxml b/potlatch2.mxml
index f878b7caac2171945de43e927500638ee088f682..9aa18c68810b40ee1f87d66e83a8e5bc7f8e0567 100755 (executable)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -35,8 +35,8 @@
         <mx:Spacer width="100%"/>
         <mx:Button label="Help" click="new HelpDialog().init();" />
         <mx:Button label="Options" click="new OptionsDialog().init();" /> 
-        <mx:Button label="Save" icon="@Embed('embedded/save.svg')" click="SaveManager.saveChanges();"
-                       enabled="{MainUndoStack.getGlobalStack().canUndo()}"/>
+        <mx:Button label="Save" icon="@Embed('embedded/save.svg')" click="SaveManager.saveChanges();" id="saveButton" 
+                       enabled="false"/>
     </mx:ApplicationControlBar>
     
     <mx:HDividedBox width="100%" height="100%">
@@ -214,6 +214,8 @@
             conn.addEventListener(Connection.LOAD_COMPLETED, onDataComplete);
             conn.addEventListener(Connection.SAVE_STARTED, onDataStart);
             conn.addEventListener(Connection.SAVE_COMPLETED, onDataComplete);
+            conn.addEventListener(Connection.DATA_DIRTY, onDataDirty);
+            conn.addEventListener(Connection.DATA_CLEAN, onDataClean);
                }
                
         public function onResizeMap():void {
@@ -242,7 +244,13 @@
                        else                            { dataWorking.text=""; }
                        dataWorking.visible=(dataWorking.text!="");
                }
-        
+        private function onDataDirty(event:Event):void {
+                       saveButton.enabled=true;
+               }
+               private function onDataClean(event:Event):void {
+                       saveButton.enabled=false;
+               }
+               
         private function onImageryLoad(event:Event):void {
                        var xml:XML = new XML(URLLoader(event.target).data);
             theController.imagery=new Array(