From 0e97f9b3773585d8fb76659dc710726a888c4851 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Fri, 6 Mar 2015 14:31:01 +0100 Subject: Make JOSM button work in https mode. The JOSM button now contacts JOSM on http://localhost:8111/ if the taginfo page is using http and https://localhost:8112/ if it is using https. This way we don't have a problem with mixed content. Also the way JOSM is called now works without the iframes which were a hack around the (then) missing CORS ability. --- web/views/key.erb | 1 - web/views/relation.erb | 1 - web/views/tag.erb | 1 - 3 files changed, 3 deletions(-) (limited to 'web/views') diff --git a/web/views/key.erb b/web/views/key.erb index ceb9928..42434d5 100644 --- a/web/views/key.erb +++ b/web/views/key.erb @@ -117,7 +117,6 @@ - <% javascript do JS.raw(<<"JAVASCRIPT") function redraw_chart() { diff --git a/web/views/relation.erb b/web/views/relation.erb index caca294..cbda1be 100644 --- a/web/views/relation.erb +++ b/web/views/relation.erb @@ -64,7 +64,6 @@ - <% javascript do JS.raw(<<"JAVASCRIPT") function page_init2() { diff --git a/web/views/tag.erb b/web/views/tag.erb index dda4594..0e87439 100644 --- a/web/views/tag.erb +++ b/web/views/tag.erb @@ -104,7 +104,6 @@ - <% javascript do JS.raw(<<"JAVASCRIPT") function page_init2() { -- cgit v1.2.3