Resize the map div when the page load is complete (via onload) in case the

[rails.git] / app / views / site / edit.rhtml

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index c5d40d9a8ee987ae30c3605a4b4880ccf561b3f5..d2657d26f141627c1f4b9274f9869fd86820d993 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -44,14 +44,16 @@
     for editing OpenStreetMap.
 </div>
 <%= javascript_include_tag 'swfobject.js' %>
-<script type="text/javascript">
+<script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
-  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "700", "600", "6", "#FFFFFF");
-  var changesaved = true;
-
+  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
+  // 700,600 for fixed size, 100%,100% for resizable
+  var changesaved=true;
+  var winie=false; if (document.all && window.print) { winie=true; }
+  
   window.onbeforeunload=function() {
-       if (!changesaved) {
-         return "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)";
+       if (!changesaved && !winie) {
+           return "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point.)";
        }
   }
 
@@ -62,7 +64,7 @@
     fo.addVariable('scale',sc);
     fo.addVariable('token','<%= session[:token] %>');
     <% if params['gpx'] %>
-    fo.addVariable('gpx','<%= h(params['gpx']) + "/data" %>');
+    fo.addVariable('gpx','<%= h(params['gpx']) + "/data.xml" %>');
     <% end %>
     fo.write("map");
   }
@@ -101,9 +103,10 @@
 
     resizeMap();
   }
+  
+  handleResize();
 
-  window.onresize = handleResize;
   window.onload = handleResize;
-
+  window.onresize = handleResize;
 </script>
 <% end %>