From 64d076847b8b1a5899833db9a9ef88064cd14433 Mon Sep 17 00:00:00 2001 From: Richard Fairhurst Date: Thu, 23 Apr 2009 17:54:17 +0000 Subject: [PATCH] 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) --- app/controllers/amf_controller.rb | 8 ++++---- app/views/site/edit.rhtml | 2 ++ public/potlatch/potlatch.swf | Bin 174639 -> 174982 bytes 3 files changed, 6 insertions(+), 4 deletions(-) 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 7befcbdbd3447aaeff524a49d41fd3986ecd79ff..20112747a9dc2eef3c462aa8550e5b03871242d2 100755 GIT binary patch delta 10997 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 Zyj?4m!zMC7s_yp>cdyUHi7#ns{|C4zGadi{ -- 2.39.5