Merge 2bc7f9c into e63157a

lsegal · Jul 8, 2019 · d22340f · d22340f
2 parents e63157a + 2bc7f9c
commit d22340f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/templates/default/fulldoc/html/frames.erb b/templates/default/fulldoc/html/frames.erb
@@ -4,7 +4,7 @@
   <meta charset="<%= charset %>">
 	<title><%= options.title %></title>
 </head>
-<script type="text/javascript" charset="utf-8">
+<script type="text/javascript">
   var match = unescape(window.location.hash).match(/^#!(.+)/);
   var name = match ? match[1] : '<%= url_for_main %>';
   name = name.replace(/^(\w+):\/\//, '').replace(/^\/\//, '');

diff --git a/templates/default/fulldoc/html/full_list.erb b/templates/default/fulldoc/html/full_list.erb
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="<%= charset %>" />
     <% stylesheets_full_list.each do |stylesheet| %>
-      <link rel="stylesheet" href="<%= mtime_url(stylesheet) %>" type="text/css" media="screen" charset="utf-8" />
+      <link rel="stylesheet" href="<%= mtime_url(stylesheet) %>" type="text/css" media="screen" />
     <% end %>
 
     <% javascripts_full_list.each do |javascript| %>

diff --git a/templates/default/layout/html/headers.erb b/templates/default/layout/html/headers.erb
@@ -7,7 +7,7 @@
   <% end %>
 </title>
 <% stylesheets.each do |stylesheet| %>
-  <link rel="stylesheet" href="<%= mtime_url(stylesheet) %>" type="text/css" charset="utf-8" />
+  <link rel="stylesheet" href="<%= mtime_url(stylesheet) %>" type="text/css" />
 <% end %>
 <%= erb :script_setup %>
 <% javascripts.each do |javascript| %>

diff --git a/templates/default/layout/html/script_setup.erb b/templates/default/layout/html/script_setup.erb
@@ -1,4 +1,4 @@
-<script type="text/javascript" charset="utf-8">
+<script type="text/javascript">
   pathId = <%= @path ? @path.inspect : 'null' %>;
   relpath = '<%= u = url_for(''); u + (u != '' ? '/' : '') %>';
 </script>
diff --git a/templates/default/onefile/html/headers.erb b/templates/default/onefile/html/headers.erb
@@ -1,6 +1,6 @@
 <style type="text/css">
   <%= @css_data %>
 </style>
-<script type="text/javascript" charset="utf-8">
+<script type="text/javascript">
   <%= @js_data %>
 </script>
diff --git a/templates/guide/layout/html/layout.erb b/templates/guide/layout/html/layout.erb
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <%= erb(:headers) %>
-		<script type="text/javascript" charset="utf-8">
+		<script type="text/javascript">
 			$(function() {
 				$('.object_link').each(function() {
 					$(this).html($(this).find('a').html())