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

Using javascript and data attribute instead of inline css

Browse source
This commit is contained in:
Štefan Baebler 2018-03-20 01:37:18 +01:00
parent 74694bcdcd
commit aa39179777
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -334,6 +334,11 @@ $(document).ready(function () {
}); });
} }
}); });
$('.colour-preview-box').each(function (index, value) {
console.log($(this));
$(this).css("background-color", $(this).data("colour"));
});
} }
page.unload = function() { page.unload = function() {

2
app/helpers/browse_helper.rb
View file

@ -77,7 +77,7 @@ module BrowseHelper
elsif url = telephone_link(key, value) elsif url = telephone_link(key, value)
link_to h(value), url, :title => t("browse.tag_details.telephone_link", :phone_number => value) link_to h(value), url, :title => t("browse.tag_details.telephone_link", :phone_number => value)
elsif colour_value = colour_preview(key, value) elsif colour_value = colour_preview(key, value)
content_tag(:span, "", :class => "colour-preview-box", :style => "background-color:#{colour_value}", :title => t("browse.tag_details.colour_preview", :colour_value => colour_value)) + colour_value content_tag(:span, "", :class => "colour-preview-box", :"data-colour" => colour_value, :title => t("browse.tag_details.colour_preview", :colour_value => colour_value)) + colour_value
else else
linkify h(value) linkify h(value)
end end

2
test/helpers/browse_helper_test.rb
View file

@ -136,7 +136,7 @@ class BrowseHelperTest < ActionView::TestCase
assert_dom_equal "<a title=\"The Q123 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q123?uselang=en\">Q123</a>", html assert_dom_equal "<a title=\"The Q123 item on Wikidata\" href=\"//www.wikidata.org/wiki/Q123?uselang=en\">Q123</a>", html
html = format_value("colour", "#f00") html = format_value("colour", "#f00")
assert_dom_equal %(<span class="colour-preview-box" style="background-color:#f00" title="Colour #f00 preview"></span>#f00), html assert_dom_equal %(<span class="colour-preview-box" data-colour="#f00" title="Colour #f00 preview"></span>#f00), html
end end
def test_icon_tags def test_icon_tags