From b95e3e6e28b7bce0efb07db2ca1ec01d6a5dc784 Mon Sep 17 00:00:00 2001 From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> Date: Thu, 21 Jul 2022 22:56:04 +0200 Subject: [PATCH] [JENKINS-60866] Extract inline JS from progressiveText (log view) (#6866) Co-authored-by: Daniel Beck --- .../resources/lib/hudson/progressive-text.js | 54 ++++++++++++++++++ .../lib/hudson/progressiveText.jelly | 57 +------------------ 2 files changed, 56 insertions(+), 55 deletions(-) create mode 100644 core/src/main/resources/lib/hudson/progressive-text.js diff --git a/core/src/main/resources/lib/hudson/progressive-text.js b/core/src/main/resources/lib/hudson/progressive-text.js new file mode 100644 index 0000000000..52541248eb --- /dev/null +++ b/core/src/main/resources/lib/hudson/progressive-text.js @@ -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); +}); diff --git a/core/src/main/resources/lib/hudson/progressiveText.jelly b/core/src/main/resources/lib/hudson/progressiveText.jelly index 053cb6819c..50c56a6dea 100644 --- a/core/src/main/resources/lib/hudson/progressiveText.jelly +++ b/core/src/main/resources/lib/hudson/progressiveText.jelly @@ -35,59 +35,6 @@ THE SOFTWARE. --> - - +
+