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

URI encode the X-Page-Title header

Browse source 
Browsers's are inconsistent in how they interpret the encoding
of a response header in an XHR request, so URI encode it so that
it simple ASCII we can then decode it again in the browser.
This commit is contained in:
Tom Hughes 2015-03-17 18:49:39 +00:00
parent 05caad1a5d
commit e2aef40437
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/index.js
View file

@ -54,7 +54,7 @@ $(document).ready(function () {
if (xhr.getResponseHeader('X-Page-Title')) {
var title = xhr.getResponseHeader('X-Page-Title');
document.title = decodeURIComponent(escape(title));
document.title = decodeURIComponent(title);
}
$('head')

4
app/helpers/title_helper.rb
View file

@ -8,10 +8,10 @@ module TitleHelper
def set_title(title = false)
if title
@title = TitleHelper.coder.decode(title.gsub("<bdi>", "\u202a").gsub("</bdi>", "\u202c"))
response.headers["X-Page-Title"] = t("layouts.project_name.title") + " | " + @title
response.headers["X-Page-Title"] = URI.escape(t("layouts.project_name.title") + " | " + @title)
else
@title = title
response.headers["X-Page-Title"] = t("layouts.project_name.title")
response.headers["X-Page-Title"] = URI.escape(t("layouts.project_name.title"))
end
end
end

9
test/helpers/title_helper_test.rb
View file

@ -1,3 +1,4 @@
# coding: utf-8
require "test_helper"
class TitleHelperTest < ActionView::TestCase
@ -7,11 +8,15 @@ class TitleHelperTest < ActionView::TestCase
assert_nil @title
set_title("Test Title")
assert_equal "OpenStreetMap | Test Title", response.header["X-Page-Title"]
assert_equal "OpenStreetMap%20%7C%20Test%20Title", response.header["X-Page-Title"]
assert_equal "Test Title", @title
set_title("Test & Title")
assert_equal "OpenStreetMap | Test & Title", response.header["X-Page-Title"]
assert_equal "OpenStreetMap%20%7C%20Test%20&%20Title", response.header["X-Page-Title"]
assert_equal "Test & Title", @title
set_title("Tést & Tïtlè")
assert_equal "OpenStreetMap%20%7C%20T%C3%A9st%20&%20T%C3%AFtl%C3%A8", response.header["X-Page-Title"]
assert_equal "Tést & Tïtlè", @title
end
end