[JENKINS-60866] Extract inline JS from progressiveText (log view) (#6866)

Co-authored-by: Daniel Beck <daniel-beck@users.noreply.github.com>
This commit is contained in:
Daniel BeckandDaniel Beck authored and GitHub committed 2022-07-21 22:56:04 +02:00
1 parent 4d094c011f
commit b95e3e6e28
2 files changed
+56 -55

No files matched your search

@@ -0,0 +1,54 @@
Behaviour.specify('.progressiveText-holder', 'progressive-text', 0, function (holder) {
let href = holder.getAttribute('data-href');
let idref = holder.getAttribute('data-idref');
let spinner = holder.getAttribute('data-spinner');
let startOffset = holder.getAttribute('data-start-offset');
let onFinishEvent = holder.getAttribute('data-on-finish-event');
var scroller = new AutoScroller(document.body);
/*
fetches the latest update from the server
@param e
DOM node that gets the text appended to
@param href
Where to retrieve additional text from
*/
function fetchNext(e,href,onFinishEvent) {
var headers = {};
if (e.consoleAnnotator!=undefined)
headers["X-ConsoleAnnotator"] = e.consoleAnnotator;
new Ajax.Request(href,{
method: "post",
parameters: {"start":e.fetchedBytes},
requestHeaders: headers,
onComplete: function(rsp,_) {
/* append text and do autoscroll if applicable */
var stickToBottom = scroller.isSticking();
var text = rsp.responseText;
if(text!="") {
var p = document.createElement("DIV");
e.appendChild(p); // Needs to be first for IE
p.innerHTML = text;
Behaviour.applySubtree(p);
if(stickToBottom) scroller.scrollToBottom();
}
e.fetchedBytes = rsp.getResponseHeader("X-Text-Size");
e.consoleAnnotator = rsp.getResponseHeader("X-ConsoleAnnotator");
if(rsp.getResponseHeader("X-More-Data")=="true") {
setTimeout(function(){fetchNext(e,href,onFinishEvent);},1000);
} else {
if (spinner !== '') {
$(spinner).style.display = "none";
}
if (onFinishEvent) {
Event.fire(window, onFinishEvent);
}
}
}
});
}
$(idref).fetchedBytes = startOffset !== '' ? Number(startOffset) : 0;
fetchNext($(idref),href,onFinishEvent);
});
@@ -35,59 +35,6 @@ THE SOFTWARE.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<!--
script code
-->
<script>
var scroller = new AutoScroller(document.body);
<j:if test="${requestScope.progressiveTextScript==null}">
<j:set target="${requestScope}" property="progressiveTextScript" value="initialized" />
<!--
fetches the latest update from the server
@param e
DOM node that gets the text appended to
@param href
Where to retrieve additional text from
-->
function fetchNext(e,href,onFinishEvent) {
var headers = {};
if (e.consoleAnnotator!=undefined)
headers["X-ConsoleAnnotator"] = e.consoleAnnotator;
new Ajax.Request(href,{
method: "post",
parameters: {"start":e.fetchedBytes},
requestHeaders: headers,
onComplete: function(rsp,_) {
<!-- append text and do autoscroll if applicable-->
var stickToBottom = scroller.isSticking();
var text = rsp.responseText;
if(text!="") {
var p = document.createElement("DIV");
e.appendChild(p); // Needs to be first for IE
p.innerHTML = text;
Behaviour.applySubtree(p);
if(stickToBottom) scroller.scrollToBottom();
}
e.fetchedBytes = rsp.getResponseHeader("X-Text-Size");
e.consoleAnnotator = rsp.getResponseHeader("X-ConsoleAnnotator");
if(rsp.getResponseHeader("X-More-Data")=="true") {
setTimeout(function(){fetchNext(e,href,onFinishEvent);},1000);
} else {
<j:if test="${spinner!=null}">
$$("${spinner}").style.display = "none";
</j:if>
if (onFinishEvent) {
Event.fire(window, onFinishEvent);
}
}
}
});
}
</j:if>
$$("${idref}").fetchedBytes = ${empty(startOffset)?0:startOffset};
fetchNext($$("${idref}"),"${href}","${empty(onFinishEvent)?"":onFinishEvent}");
</script>
<div class="progressiveText-holder" data-href="${href}" data-idref="${idref}" data-spinner="${spinner}" data-start-offset="${startOffset}" data-on-finish-event="${empty(onFinishEvent) ? '' : onFinishEvent}"/>
<st:adjunct includes="lib.hudson.progressive-text"/>
</j:jelly>