From 1a5b5e19fc38955d5e755574276fc39fdee438fa Mon Sep 17 00:00:00 2001
From: Gosha Arinich <me@goshakkk.name>
Date: Thu, 3 Jan 2013 19:21:28 +0300
Subject: move error page js into script tag

---
 .../templates/rescues/_request_and_response.erb    |  6 +++---
 .../middleware/templates/rescues/_trace.erb        |  4 ++--
 .../middleware/templates/rescues/layout.erb        | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_dispatch/middleware')

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
index fbb47f60a2..035f08d2f4 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
@@ -1,6 +1,6 @@
 <% unless @exception.blamed_files.blank? %>
   <% if (hide = @exception.blamed_files.length > 8) %>
-    <a href="#" onclick="s = document.getElementById('blame_trace').style; s.display = s.display == 'none' ? 'block' : 'none'; return false;">Toggle blamed files</a>
+    <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>
 <% end %>
@@ -21,12 +21,12 @@
 <p><b>Parameters</b>:</p> <pre><%=h request_dump %></pre>
 
 <div class="details">
-  <div class="summary"><a href="#" onclick="s = document.getElementById('session_dump').style; s.display = s.display == 'none' ? 'block' : 'none'; return false;">Toggle session dump</a></div>
+  <div class="summary"><a href="#" onclick="toggleSessionDump()">Toggle session dump</a></div>
   <div id="session_dump" style="display:none"><pre><%= debug_hash @request.session %></pre></div>
 </div>
 
 <div class="details">
-  <div class="summary"><a href="#" onclick="s = document.getElementById('env_dump').style; s.display = s.display == 'none' ? 'block' : 'none'; return false;">Toggle env dump</a></div>
+  <div class="summary"><a href="#" onclick="toggleEnvDump()">Toggle env dump</a></div>
   <div id="env_dump" style="display:none"><pre><%= debug_hash @request.env.slice(*@request.class::ENV_METHODS) %></pre></div>
 </div>
 
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
index 8771b5fd6d..463ca39563 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
@@ -12,8 +12,8 @@
 <div id="traces">
   <% names.each do |name| %>
     <%
-      show = "document.getElementById('#{name.gsub(/\s/, '-')}').style.display='block';"
-      hide = (names - [name]).collect {|hide_name| "document.getElementById('#{hide_name.gsub(/\s/, '-')}').style.display='none';"}
+      show = "show('#{name.gsub(/\s/, '-')}');"
+      hide = (names - [name]).collect {|hide_name| "hide('#{hide_name.gsub(/\s/, '-')}');"}
     %>
     <a href="#" onclick="<%= hide.join %><%= show %>; return false;"><%= name %></a> <%= '|' unless names.last == name %>
   <% end %>
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
index ff33430532..1aeff6c1b9 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/layout.erb
@@ -114,6 +114,28 @@
     a:visited { color: #666; }
     a:hover { color: #C52F24; }
   </style>
+
+  <script>
+    var toggle = function(id) {
+      var s = document.getElementById(id).style;
+      s.display = s.display == 'none' ? 'block' : 'none';
+    }
+    var show = function(id) {
+      document.getElementById(id).style.display = 'block';
+    }
+    var hide = function(id) {
+      document.getElementById(id).style.display = 'none';
+    }
+    var toggleTrace = function() {
+      toggle('blame_trace');
+    }
+    var toggleSessionDump = function() {
+      toggle('session_dump');
+    }
+    var toggleEnvDump = function() {
+      toggle('env_dump');
+    }
+  </script>
 </head>
 <body>
 
-- 
cgit v1.2.3