cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace swfobject 1.5 with swfobject 2

Browse source
This commit is contained in:
Grant Slater 2011-10-06 00:05:46 +01:00 • committed by Tom Hughes
parent 14dd533cba
commit a333712ad7
4 changed files with 52 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/views/site/_potlatch.html.erb
View file

@ -8,8 +8,6 @@
<script type="text/javascript" defer="defer"> <script type="text/javascript" defer="defer">
var brokenContentSize = $("content").offsetWidth == 0; var brokenContentSize = $("content").offsetWidth == 0;
var fo = new SWFObject("<%= asset_path("/potlatch/potlatch.swf") %>", "potlatch", "100%", "100%", "6", "#FFFFFF");
// 700,600 for fixed size, 100%,100% for resizable
var changesaved=true; var changesaved=true;
var winie=false; if (document.all && window.print) { winie=true; } var winie=false; if (document.all && window.print) { winie=true; }
@ -23,16 +21,26 @@
function doSWF(lat,lon,sc) { function doSWF(lat,lon,sc) {
if (sc < 11) sc = 11; if (sc < 11) sc = 11;
fo.addVariable('winie',winie);
fo.addVariable('scale',sc); var flashvars = {};
fo.addVariable('token','<%= session[:token] %>'); flashvars.winie = winie;
if (lat) { fo.addVariable('lat',lat); } flashvars.scale = sc;
if (lon) { fo.addVariable('long',lon); } flashvars.token = '<%= session[:token] %>';
<% if params['gpx'] %>fo.addVariable('gpx' ,'<%= h(params['gpx'] ) %>');<% end %> if (lat) { flashvars.lat = lat; }
<% if params['way'] %>fo.addVariable('way' ,'<%= h(params['way'] ) %>');<% end %> if (lon) { flashvars.long = lon; }
<% if params['node'] %>fo.addVariable('node' ,'<%= h(params['node'] ) %>');<% end %> <% if params['gpx'] %>flashvars.gpx = '<%= h(params['gpx'] ) %>';<% end %>
<% if params['tileurl'] %>fo.addVariable('custombg','<%= h(params['tileurl']) %>');<% end %> <% if params['way'] %>flashvars.way = '<%= h(params['way'] ) %>';<% end %>
fo.write("map"); <% if params['node'] %>flashvars.node = '<%= h(params['node'] ) %>';<% end %>
<% if params['tileurl'] %>flashvars.custombg = '<%= h(params['tileurl']) %>';<% end %>
var params = {};
var attributes = {};
attributes.id = "potlatch";
attributes.bgcolor = "#FFFFFF";
swfobject.embedSWF("<%= asset_path("/potlatch/potlatch.swf") %>", "map", "100%", "100%", "6","<%= asset_path("/expressInstall.swf") %>", flashvars, params, attributes);
// 700,600 for fixed size, 100%,100% for resizable
} }
doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>); doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);

49
app/views/site/_potlatch2.html.erb
View file

@ -14,8 +14,6 @@
<script type="text/javascript" defer="defer"> <script type="text/javascript" defer="defer">
var brokenContentSize = $("content").offsetWidth == 0; var brokenContentSize = $("content").offsetWidth == 0;
var fo = new SWFObject("<%= asset_path("/potlatch2/potlatch2.swf") %>", "potlatch", "100%", "100%", "10", "#FFFFFF");
// 700,600 for fixed size, 100%,100% for resizable
var changesaved=true; var changesaved=true;
window.onbeforeunload=function() { window.onbeforeunload=function() {
@ -27,31 +25,40 @@
function markChanged(a) { changesaved=a; } function markChanged(a) { changesaved=a; }
function doSWF(lat,lon,zoom) { function doSWF(lat,lon,zoom) {
fo.addParam("base","/potlatch2"); var flashvars = {};
if (lat) { fo.addVariable("lat",lat); } if (lat) { flashvars.lat = lat; }
if (lon) { fo.addVariable("lon",lon); } if (lon) { flashvars.lon = lon; }
fo.addVariable("locale", "<%= Potlatch2::LOCALES[locale] %>"); flashvars.zoom = zoom;
flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
<% if params['gpx'] %> <% if params['gpx'] %>
fo.addVariable('gpx' ,'<%= h(params['gpx']) %>'); flashvars.gpx = '<%= h(params['gpx']) %>';
<% end %> <% end %>
<% if params['tileurl'] %> <% if params['tileurl'] %>
fo.addVariable('tileurl' ,'<%= h(params['tileurl']) %>'); flashvars.tileurl = '<%= h(params['tileurl']) %>';
<% end %> <% end %>
fo.addVariable("zoom",zoom); flashvars.api = "<%= request.protocol + request.host_with_port %>/api/<%= API_VERSION %>/";
fo.addVariable("api","<%= request.protocol + request.host_with_port %>/api/<%= API_VERSION %>/"); flashvars.policy = "<%= request.protocol + request.host_with_port %>/api/crossdomain.xml";
fo.addVariable("policy","<%= request.protocol + request.host_with_port %>/api/crossdomain.xml"); flashvars.connection = "XML";
fo.addVariable("connection","XML"); flashvars.show_help = "once";
fo.addVariable("show_help","once");
<% if token %> <% if token %>
fo.addVariable("oauth_token","<%= token.token %>"); flashvars.oauth_token = "<%= token.token %>";
fo.addVariable("oauth_token_secret","<%= token.secret %>"); flashvars.oauth_token_secret = "<%= token.secret %>";
fo.addVariable("oauth_consumer_key","<%= token.client_application.key %>"); flashvars.oauth_consumer_key = "<%= token.client_application.key %>";
fo.addVariable("oauth_consumer_secret","<%= token.client_application.secret %>"); flashvars.oauth_consumer_secret = "<%= token.client_application.secret %>";
<% end %> <% end %>
fo.addVariable("maximise_function","maximiseMap"); flashvars.maximise_function = "maximiseMap";
fo.addVariable("minimise_function","minimiseMap"); flashvars.minimise_function = "minimiseMap";
fo.addVariable("move_function","mapMoved"); flashvars.move_function = "mapMoved";
fo.write("map");
var params = {};
params.base = "/potlatch2";
var attributes = {};
attributes.id = "potlatch";
attributes.bgcolor = "#FFFFFF";
swfobject.embedSWF("<%= asset_path("/potlatch2/potlatch2.swf") %>", "map", "100%", "100%", "10.1.85","<%= asset_path("/expressInstall.swf") %>", flashvars, params, attributes);
// 700,600 for fixed size, 100%,100% for resizable
} }
doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>); doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);

BIN
public/expressInstall.swf Executable file
View file

Binary file not shown.

12
public/javascripts/swfobject.js
View file

File diff suppressed because one or more lines are too long