Skip to content
Browse files
[JENKINS-20772] Only show error message in dialog
This change removes the superfluous UI elements around the error
message if possible. Otherwise, fall back to existing behavior
of adding entire page to iframe.
  • Loading branch information
daniel-beck committed Dec 23, 2013
1 parent c7dcb99 commit b856cc2434b33ed7fec3492223e141747369bba3
@@ -41,6 +41,7 @@ THE SOFTWARE.
<h1 style="text-align: center">
<img src="${imagesURL}/rage.png" height="179" width="154"/> <span style="font-size:50px"><st:nbsp/>${%Oops!}</span>
<div id="error-description">
@@ -51,6 +52,7 @@ THE SOFTWARE.
<h2>${%Stack trace}</h2>
<pre style="margin:2em; clear:both">${h.printThrowable(request.getAttribute('javax.servlet.error.exception'))}</pre>
@@ -12,7 +12,7 @@ Behaviour.specify("INPUT.apply-button", 'apply', 0, function (e) {

responseDialog.setBody("<div id='"+containerId+"'></iframe>");
responseDialog.setBody("<div id='"+containerId+"'></div>");
var target; // iframe

@@ -42,7 +42,12 @@ Behaviour.specify("INPUT.apply-button", 'apply', 0, function (e) {
} else {
// otherwise this is possibly an error from the server, so we need to render the whole content.
var doc = target.contentDocument || target.contentWindow.document;
var error = doc.getElementById('error-description');
if (!error) {
// fallback if it's not a regular error dialog from oops.jelly: use the entire body
error = doc.getElementsByTagName('body')[0];
var r = YAHOO.util.Dom.getClientRegion();

0 comments on commit b856cc2

Please sign in to comment.