X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/41e45bad51c90dd4e131068ba1cfc1dd1184155f..eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index fec202ca5..3830df88b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -418,6 +418,10 @@ class ApplicationController < ActionController::Base request.body.rewind end + def map_layout + request.xhr? ? 'xhr' : 'map' + end + def preferred_editor editor = if params[:editor] params[:editor] @@ -427,7 +431,7 @@ class ApplicationController < ActionController::Base DEFAULT_EDITOR end - if request.env['HTTP_USER_AGENT'] =~ /MSIE/ and editor == 'id' + if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/ and editor == 'id' editor = 'potlatch2' end