Skip to content

Commit

Permalink
Merge pull request #8750 from tricknotes/remove-unnecessary-h
Browse files Browse the repository at this point in the history
Remove unnecessary `ERB::Util::h`
  • Loading branch information
carlosantoniodasilva committed Jan 4, 2013
2 parents f6386f7 + fbb3e8e commit e752cb4
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
Expand Up @@ -2,7 +2,7 @@
<% if (hide = @exception.blamed_files.length > 8) %>
<a href="#" onclick="toggleTrace()">Toggle blamed files</a>
<% end %>
<pre id="blame_trace" <%='style="display:none"' if hide %>><code><%=h @exception.describe_blame %></code></pre>
<pre id="blame_trace" <%='style="display:none"' if hide %>><code><%= @exception.describe_blame %></code></pre>
<% end %>
<%
Expand All @@ -18,7 +18,7 @@
%>

<h2 style="margin-top: 30px">Request</h2>
<p><b>Parameters</b>:</p> <pre><%=h request_dump %></pre>
<p><b>Parameters</b>:</p> <pre><%= request_dump %></pre>

<div class="details">
<div class="summary"><a href="#" onclick="toggleSessionDump()">Toggle session dump</a></div>
Expand All @@ -31,4 +31,4 @@
</div>

<h2 style="margin-top: 30px">Response</h2>
<p><b>Headers</b>:</p> <pre><%=h defined?(@response) ? @response.headers.inspect.gsub(',', ",\n") : 'None' %></pre>
<p><b>Headers</b>:</p> <pre><%= defined?(@response) ? @response.headers.inspect.gsub(',', ",\n") : 'None' %></pre>
Expand Up @@ -20,7 +20,7 @@
<% traces.each do |name, trace| %>
<div id="<%= name.gsub(/\s/, '-') %>" style="display: <%= (name == "Application Trace") ? 'block' : 'none' %>;">
<pre><code><%=h trace.join "\n" %></code></pre>
<pre><code><%= trace.join "\n" %></code></pre>
</div>
<% end %>
</div>
@@ -1,14 +1,14 @@
<header>
<h1>
<%=h @exception.class.to_s %>
<%= @exception.class.to_s %>
<% if @request.parameters['controller'] %>
in <%=h @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
in <%= @request.parameters['controller'].camelize %>Controller<% if @request.parameters['action'] %>#<%= @request.parameters['action'] %><% end %>
<% end %>
</h1>
</header>

<div id="container">
<h2><%=h @exception.message %></h2>
<h2><%= @exception.message %></h2>

<%= render template: "rescues/_source" %>
<%= render template: "rescues/_trace" %>
Expand Down
Expand Up @@ -3,5 +3,5 @@
</header>

<div id="container">
<h2><%=h @exception.message %></h2>
<h2><%= @exception.message %></h2>
</div>
Expand Up @@ -2,13 +2,13 @@
<h1>Routing Error</h1>
</header>
<div id="container">
<h2><%=h @exception.message %></h2>
<h2><%= @exception.message %></h2>
<% unless @exception.failures.empty? %>
<p>
<h2>Failure reasons:</h2>
<ol>
<% @exception.failures.each do |route, reason| %>
<li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
<li><code><%= route.inspect.gsub('\\', '') %></code> failed because <%= reason.downcase %></li>
<% end %>
</ol>
</p>
Expand Down
@@ -1,20 +1,20 @@
<% @source_extract = @exception.source_extract(0, :html) %>
<header>
<h1>
<%=h @exception.original_exception.class.to_s %> in
<%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %>
<%= @exception.original_exception.class.to_s %> in
<%= @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%= @request.parameters["action"] %>
</h1>
</header>

<div id="container">
<p>
Showing <i><%=h @exception.file_name %></i> where line <b>#<%=h @exception.line_number %></b> raised:
Showing <i><%= @exception.file_name %></i> where line <b>#<%= @exception.line_number %></b> raised:
</p>
<pre><code><%=h @exception.message %></code></pre>
<pre><code><%= @exception.message %></code></pre>

<div class="source">
<div class="info">
<p>Extracted source (around line <strong>#<%=h @exception.line_number %></strong>):</p>
<p>Extracted source (around line <strong>#<%= @exception.line_number %></strong>):</p>
</div>
<div class="data">
<table cellpadding="0" cellspacing="0" class="lines">
Expand All @@ -36,7 +36,7 @@
</div>
</div>

<p><%=h @exception.sub_template_message %></p>
<p><%= @exception.sub_template_message %></p>

<%= render template: "rescues/_trace" %>
<%= render template: "rescues/_request_and_response" %>
Expand Down
Expand Up @@ -2,5 +2,5 @@
<h1>Unknown action</h1>
</header>
<div id="container">
<h2><%=h @exception.message %></h2>
<h2><%= @exception.message %></h2>
</div>

0 comments on commit e752cb4

Please sign in to comment.