提交 d5700f88 编写于 作者: O OHTAKE Tomohiro

[FIXED JENKINS-11307] "Tailing" the console of an active job broken in 1.434

上级 a117dc00
......@@ -61,6 +61,9 @@ Upcoming changes</a>
<li class=bug>
Avoid overwriting the repository definitions.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-11229">issue 11229</a>)
<li class=bug>
"Tailing" the console of an active job broken in 1.434
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-11307">issue 11307</a>)
<li class=rfe>
Improved the classloading performance
</ul>
......
......@@ -1370,7 +1370,8 @@ function AutoScroller(scrollContainer) {
// the element height.
//var height = ((scrollDiv.style.pixelHeight) ? scrollDiv.style.pixelHeight : scrollDiv.offsetHeight);
var height = getViewportHeight();
var diff = currentHeight - scrollDiv.scrollTop - height;
var scrollPos = Math.max(scrollDiv.scrollTop, document.documentElement.scrollTop);
var diff = currentHeight - scrollPos - height;
// window.alert("currentHeight=" + currentHeight + ",scrollTop=" + scrollDiv.scrollTop + ",height=" + height);
return diff < this.bottomThreshold;
......@@ -1378,7 +1379,9 @@ function AutoScroller(scrollContainer) {
scrollToBottom : function() {
var scrollDiv = $(this.scrollContainer);
scrollDiv.scrollTop = this.getCurrentHeight();
var currentHeight = this.getCurrentHeight();
if(document.documentElement) document.documentElement.scrollTop = currentHeight
scrollDiv.scrollTop = currentHeight;
}
};
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册