]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: e5c4822)
Support using iD on Internet Explorer 11 and above
authorBryan Housel <bryan@mapbox.com>
Fri, 11 Dec 2015 02:34:18 +0000 (18:34 -0800)
committerBryan Housel <bryan@mapbox.com>
Fri, 11 Dec 2015 02:34:33 +0000 (18:34 -0800)
app/controllers/application_controller.rb patch | blob | history
app/views/site/id.html.erb patch | blob | history

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3470db86c0774d43db7fda4dd234690257ae5d91..2ee701e9ceeb5c74e42f020d8676b2747a40cdb5 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -435,10 +435,6 @@ class ApplicationController < ActionController::Base
                DEFAULT_EDITOR
              end
 
                DEFAULT_EDITOR
              end
 
-    if request.env["HTTP_USER_AGENT"] =~ /MSIE|Trident/ && editor == "id"
-      editor = "potlatch2"
-    end
-
     editor
   end
 
     editor
   end
 
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 80332e887c8bff542657d294c9941f3cd4cc4547..27a3e835bf9c4d365d0f7004dc89eedecb04449c 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -10,9 +10,9 @@
 <body>
 <div id='id-container'></div>
 <script>
 <body>
 <div id='id-container'></div>
 <script>
-  if (typeof iD == 'undefined') {
+  if (typeof iD == 'undefined' || !iD.detect().support) {
     document.getElementById('id-container').innerHTML = 'This editor is supported ' +
     document.getElementById('id-container').innerHTML = 'This editor is supported ' +
-      'in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. ' +
+      'in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. ' +
       'Please upgrade your browser or use Potlatch 2 to edit the map.';
     document.getElementById('id-container').className = 'unsupported';
   } else {
       'Please upgrade your browser or use Potlatch 2 to edit the map.';
     document.getElementById('id-container').className = 'unsupported';
   } else {
The OpenStreetMap web site