masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #137 from lorenzhs/fixscrolling 

Fix read marker and scrolling behaviour
This commit is contained in:
David Cormier 2014-02-11 16:50:38 -05:00
parent eca3cf4f40 f8f25107de
commit 826c41d1d0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/glowingbear.js
View File

@ -395,14 +395,9 @@ function($rootScope,
buffer.requestedLines = 0; buffer.requestedLines = 0;
handlers.handleLineInfo(lineinfo, false, true); handlers.handleLineInfo(lineinfo, false, true);
if (oldLength > 0) { // Advance read marker by number of newly loaded lines
// We're not initially loading lines into the buffer. buffer.lastSeen += buffer.lines.length - oldLength;
// Set the read marker to the beginning of the newly loaded lines
buffer.lastSeen = buffer.lines.length - oldLength - 1;
} else {
// Initial buffer open, set correct read marker position
buffer.lastSeen += buffer.lines.length;
}
$rootScope.loadingLines = false; $rootScope.loadingLines = false;
// Scroll read marker to the center of the screen // Scroll read marker to the center of the screen
$rootScope.scrollWithBuffer(true); $rootScope.scrollWithBuffer(true);
@ -618,7 +613,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Determine if we want to scroll at all // Determine if we want to scroll at all
// Give the check 3 pixels of slack so you don't have to hit // Give the check 3 pixels of slack so you don't have to hit
// the exact spot. This fixes a bug in some browsers // the exact spot. This fixes a bug in some browsers
if ((nonIncremental && sTop < sVal) || (sTop - sVal < 3)) { if ((nonIncremental && sTop < sVal) || (Math.abs(sTop - sVal) < 3)) {
var readmarker = document.querySelector(".readmarker"); var readmarker = document.querySelector(".readmarker");
if (nonIncremental && readmarker) { if (nonIncremental && readmarker) {
// Switching channels, scroll to read marker // Switching channels, scroll to read marker