public
Fork of wycats/merb-core
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/auser/merb-core.git
Fixed display bug which caused default error exception pages to improperly 
display drop-down twirly if the path name exceeded the line length.

When receiving the default error page (500 error), the dropdown arrows
disappear on the left hand side if the path name to the offending file is
longer than the width of the display table cell.  (Lighthouse 191)

Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com>
Oliver Jakubiec (author)
Fri Mar 07 12:55:34 -0800 2008
ezmobius (committer)
Fri Mar 07 18:05:08 -0800 2008
commit  b70fa60d8142c2696efea2b4d5c812ca926ab043
tree    ba2e4cc5c0de9d62b9a17a8d367bb0f01255eb97
parent  d58d7ed55ab2363c93c5e12c40a75f7e5e54f595
...
113
114
115
 
 
 
116
117
118
119
120
121
 
 
 
122
123
124
...
176
177
178
179
180
181
182
183
184
185
186
187
188
189
...
193
194
195
196
197
198
199
200
201
202
203
204
205
206
...
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
 
226
227
228
229
230
231
232
233
234
235
236
 
 
 
237
 
 
 
238
239
240
...
243
244
245
246
247
 
248
249
250
...
301
302
303
304
305
 
...
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
...
182
183
184
 
185
186
187
188
 
 
 
189
190
191
...
195
196
197
 
198
199
200
201
 
 
 
202
203
204
...
208
209
210
 
211
212
213
214
 
 
 
215
216
217
218
219
220
221
222
223
224
 
 
 
 
 
 
 
225
226
227
228
229
230
231
232
233
234
...
237
238
239
 
 
240
241
242
243
...
294
295
296
 
297
298
0
@@ -113,12 +113,18 @@
0
         background-position:top left;
0
         background-repeat:no-repeat;
0
       }
0
+ table.trace tr.file td.expand div {
0
+ width:23px;
0
+ }
0
       table.trace .open tr.file td.expand {
0
         width:19px;
0
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAB1CAIAAAAqdO2mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAXZJREFUeNrslK1ywkAUhcMOBomEOiSdqLxEBJX0NaijOsjyHGGmCGyQQYaiiiw4gktkcOmZbpsuuzQ/M5XnqJ2d3S/n3nM3rTzPLUP7/Tt0+pLcGQwG3W53OLyHzPMtjYL7q9UqSRLrD4E1Gj1orCvKYuFHUWTVkOM44/HjDcp8/lL4r6NerzeZPMm1KFw0QkDn83m5fP2lHA4fNQvRtNvtjsfDd0WzmSfb2e/fdTqdOvdh/HLJZLOn0+d2HJ+KRGzbdl23EpFlmed5cp2maRzHQq1lvQ5KMi6EUZBGfup6E1pTfd+vrGW7jbQ2C9hTt9BpqNyIWaAwAy6xg2eBz5iRC/NomiZhGN5sqmnkauo0BUGgVQoBjQ80oCACgNQdZHfTYBkF2mxCtWWAqunWpahxIDUt3QYUxIFQpJHyIWpXjinabKbbwItMHT+NyjchrP8QKaSQQgoppJBCCimkkEIKKaSQQgoppJBCCimkkEIKKaSo+hRgAEFD17X08O2NAAAAAElFTkSuQmCC);
0
         background-position:top left;
0
         background-repeat:no-repeat;        
0
       }
0
+ table.trace .open tr.file td.expand div {
0
+ width:19px;
0
+ }
0
       table.trace tr.source td.collapse {
0
         width:19px;
0
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAB1CAIAAAAqdO2mAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAVxJREFUeNrs0zFygkAUBmBlUkgJHdABlQwVkVJKKUxBYWbkALTxMJwhltyDFkss03IF8pudIcwaDaDl/6pd2P327b7d+eHwMXs4lNkzggoVKlSoUKFChQoVKlSoUKFChQoVKlSoUKFChQqVEYqm6ft9+qiSJEkYho7jTlcw2fd9NOI4nq4gEdFwXXe1Cqco63VkWVbXRTqLhTpOwQRpF7quR1E0TgGhqvLKUFCyoQqG/rks3O6kZKW/eRFpevOCoGTXVTcMQ5EyxyDEkML1c5RzuZOICIyXqn7JBVez6282MWrx731HOv2qB8Hri2lamNk0DfpVVdV1Peodappmmua8bdvzuc7zfNprzrLMth1FnGh/X8MjCAIQv/cFz/+65PcDh7rbvYv2ZUfdj+PxsyzLgVl0hKwgTqeqKApx2LeOc7t98zyv/1FWOgvx9RPii23bmL9cetJ8Ed8CDAC6aFW8bCzFhwAAAABJRU5ErkJggg==);
0
@@ -176,14 +182,10 @@
0
        <tr><th width="25%">Parameter</th><th width="75%">Value</th></tr>
0
      </thead>
0
      <tbody>             
0
- <% unless params[:original_params].blank? %>
0
           <% params[:original_params].each_with_index do |param_value, i| %>
0
             <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= param_value.first %></td><td><%= param_value.last.inspect %></td></tr>
0
           <% end %>
0
           <%= "<tr class='odd'><td colspan='2'>None</td></tr>" if params[:original_params].empty? %>      
0
- <% else %>
0
- <tr><td colspan="2">None</td></tr>
0
- <% end %>
0
         </tbody>
0
      </table>
0
       
0
@@ -193,14 +195,10 @@
0
        <tr><th width="25%">Key</th><th width="75%">Value</th></tr>
0
      </thead>
0
      <tbody>             
0
- <% unless params[:original_session].blank? %>
0
           <% params[:original_session].each_with_index do |param_value, i| %>
0
             <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= param_value.first %></td><td><%= param_value.last.inspect %></td></tr>
0
           <% end %>
0
           <%= "<tr class='odd'><td colspan='2'>None</td></tr>" if params[:original_session].empty? %>
0
- <% else %>
0
- <tr><td colspan="2">None</td></tr>
0
- <% end %>
0
         </tbody>
0
      </table>
0
       
0
@@ -210,31 +208,27 @@
0
        <tr><th width="25%">Cookie</th><th width="75%">Value</th></tr>
0
      </thead>
0
      <tbody>      
0
- <% unless params[:original_cookies].blank? %>
0
           <% params[:original_cookies].each_with_index do |param_value, i| %>
0
             <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= param_value.first %></td><td><%= param_value.last.inspect %></td></tr>
0
           <% end %>
0
           <%= "<tr class='odd'><td colspan='2'>None</td></tr>" if params[:original_cookies].empty? %>
0
- <% else %>
0
- <tr><td colspan="2">None</td></tr>
0
- <% end %>
0
        </tbody>
0
      </table>
0
       
0
       <h3>Named Routes</h3>
0
       <table class="listing" style="display: none">
0
+ <% unless Merb::Router.named_routes.empty? %>
0
        <thead>
0
        <tr><th width="25%">Name</th><th width="75%">Route</th></tr>
0
      </thead>
0
      <tbody>
0
- <% unless Merb::Router.named_routes.empty? %>
0
- <% Merb::Router.named_routes.each_with_index do |name_route, i| %>
0
- <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= name_route.first %></td><td><%= name_route.last %></td></tr>
0
- <% end %>
0
- <% else %>
0
- <tr><td colspan="2">None</td></tr>
0
- <% end %>
0
+ <% Merb::Router.named_routes.each_with_index do |name_route, i| %>
0
+ <tr class="<%= i % 2 == 0 ? "even" : "odd" %>"><td><%= name_route.first %></td><td><%= name_route.last %></td></tr>
0
+ <% end %>
0
        </tbody>
0
+ <% else %>
0
+ <tr><td colspan="2">None</td></tr>
0
+ <% end %>
0
      </table>    
0
     </div>
0
     
0
@@ -243,8 +237,7 @@
0
       <% @exception.backtrace.each_with_index do |line, index| %>
0
         <tbody class="close">
0
           <tr class="file">
0
- <td class="expand">
0
- </td>
0
+ <td class="expand"><div>&nbsp;</div></td>
0
             <td class="path">
0
               <%= (line.match(/^([^:]+)/)[1] rescue 'unknown').sub(/\/((opt|usr)\/local\/lib\/(ruby\/)?(gems\/)?(1.8\/)?(gems\/)?|.+\/app\/)/, '') %>
0
               <% unless line.match(/\.erb:/) %>
0
@@ -301,4 +294,4 @@
0
   </div>
0
   </div>
0
 </body>
0
-</html>
0
\ No newline at end of file
0
+</html>

Comments

    No one has commented yet.