]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:45:18 +0000 (12:45 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 3 Dec 2013 16:45:18 +0000 (12:45 -0400)
IkiWiki/Plugin/osm.pm
debian/changelog
doc/style.css

index c9650d014aa1348f9c83efb77e87c76f20620452..b8255bb135f7c3c868dad302719970f610f3723b 100644 (file)
@@ -507,7 +507,7 @@ sub include_javascript ($) {
                }
        }
        if ($loader) {
-               return embed_map_code($page) . "<script type=\"text/javascript\" charset=\"utf-8\">$loader</script>";
+               return embed_map_code($page) . "<script type=\"text/javascript\">$loader</script>";
        }
        else {
                return '';
@@ -534,7 +534,7 @@ sub cgi($) {
        print "<html><body>";
        print "<div id=\"mapdiv-$map\"></div>";
        print embed_map_code();
-       print "<script type=\"text/javascript\" charset=\"utf-8\">";
+       print "<script type=\"text/javascript\">";
        print map_setup_code($map, $map,
                lat => "urlParams['lat']",
                lon => "urlParams['lon']",
index 8de2291758d8eea7dc49001bec8e0667f0cb62f2..1b0fd18ff656759b282898c04263c1cc36736d09 100644 (file)
@@ -16,6 +16,10 @@ ikiwiki (3.20130904.2) UNRELEASED; urgency=low
     rather than using the internal xapain database.
     (googlesearch plugin is too hard to turn on when xapain databases
     corrupt themselves, which happens all too frequently).
+  * osm: Remove invalid use of charset on embedded javascript tags.
+    Closes: #731197
+  * style.css: Add compatability definitions for more block-level
+    html5 elements. Closes: #731199
 
  -- Joey Hess <joeyh@debian.org>  Thu, 05 Sep 2013 10:01:10 -0400
 
index 067a3bf7a65f4449bcd2452407c137dc5c27dc2b..4c48e5c7b9ebbcb2b9b1d6a9f49915c727f2b55c 100644 (file)
@@ -5,10 +5,8 @@
  */
 
 /* html5 compat */
-article,
-header,
-footer,
-nav {
+article,aside,details,figcaption,figure,
+footer,header,hgroup,menu,nav,section {
        display: block;
 }