From: Richard Fairhurst <richard@systemed.net>
Date: Thu, 23 Apr 2009 17:54:17 +0000 (+0000)
Subject: fix another way-node/Way-Node problem in amf_controller; add WinIE JS compatibility... 
X-Git-Tag: live~7525
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/64d076847b8b1a5899833db9a9ef88064cd14433?ds=inline

fix another way-node/Way-Node problem in amf_controller; add WinIE JS compatibility via ExternalInterface (we can use this later to alert for a commit message if none is provided)
---

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 0bc5148a1..d729fdd45 100644
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -477,8 +477,8 @@ class AmfController < ApplicationController
       members.each do |m|
         mid = m[1].to_i
         if mid < 0
-          mid = renumberednodes[mid] if m[0] == 'node'
-          mid = renumberedways[mid] if m[0] == 'way'
+          mid = renumberednodes[mid] if m[0] == 'Node'
+          mid = renumberedways[mid] if m[0] == 'Way'
         end
         if mid
           typedmembers << [m[0], mid, m[2]]
@@ -621,7 +621,7 @@ class AmfController < ApplicationController
       uniques=uniques-pointlist
       uniques.each do |n|
         node = Node.find(n)
-        deleteitemrelations(user, changeset_id, id, 'node', node.version)
+        deleteitemrelations(user, changeset_id, id, 'Node', node.version)
         new_node = Node.new
         new_node.changeset_id = changeset_id
         new_node.version = node.version
@@ -765,7 +765,7 @@ class AmfController < ApplicationController
         else
           # in case the node wasn't passed (i.e. if it was previously removed
           # from the way in Potlatch)
-          deleteitemrelations(user, changeset_id, node_id, 'node', node.version)
+          deleteitemrelations(user, changeset_id, node_id, 'Node', node.version)
 	      delete_node.version = node.version
 	    end
         node.delete_with_history!(delete_node, user)
diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index e341305f5..a3a2b532a 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -75,6 +75,8 @@ zoom='14' if zoom.nil?
 	}
   }
 
+  function markChanged(a) { changesaved=a; }
+
   function doSWF(lat,lon,sc) {
     if (sc < 11) sc = 11;
     fo.addVariable('scale',sc);
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index 7befcbdbd..20112747a 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ