diff options
| author | Jochen Topf <jochen@topf.org> | 2015-03-06 14:31:01 +0100 |
|---|---|---|
| committer | Jochen Topf <jochen@topf.org> | 2015-03-06 14:31:01 +0100 |
| commit | 0e97f9b3773585d8fb76659dc710726a888c4851 (patch) | |
| tree | 3a661df17daeb5d5558f7d41530693e4e6631c53 /web/views | |
| parent | 75a1deefaea0d94c2ef024bf272c6076447fa444 (diff) | |
| download | taginfo-0e97f9b3773585d8fb76659dc710726a888c4851.tar taginfo-0e97f9b3773585d8fb76659dc710726a888c4851.tar.gz | |
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.
Diffstat (limited to 'web/views')
| -rw-r--r-- | web/views/key.erb | 1 | ||||
| -rw-r--r-- | web/views/relation.erb | 1 | ||||
| -rw-r--r-- | web/views/tag.erb | 1 |
3 files changed, 0 insertions, 3 deletions
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 @@ </table> </div> </div> -<iframe id="josmiframe" name="josmiframe"></iframe> <% 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 @@ </table> </div> </div> -<iframe id="josmiframe" name="josmiframe"></iframe> <% 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 @@ </table> </div> </div> -<iframe id="josmiframe" name="josmiframe"></iframe> <% javascript do JS.raw(<<"JAVASCRIPT") function page_init2() { |