tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #109 from lorenzhs/scrolling

Browse source 
Improve scrolling
This commit is contained in:
David Cormier 2014-01-07 10:42:33 -08:00
commit ce37e66a15
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
js/websockets.js
View file

@ -35,7 +35,7 @@ weechat.factory('handlers', ['$rootScope', 'models', 'plugins', function($rootSc
} }
if (buffer.active) { if (buffer.active) {
$rootScope.scrollToBottom(); $rootScope.scrollWithBuffer();
} }
if (!initial && !buffer.active) { if (!initial && !buffer.active) {
@ -480,7 +480,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
} }
$rootScope.$on('activeBufferChanged', function() { $rootScope.$on('activeBufferChanged', function() {
$rootScope.scrollToBottom(); $rootScope.scrollWithBuffer(true);
var ab = models.getActiveBuffer(); var ab = models.getActiveBuffer();
$rootScope.pageTitle = ab.shortName + ' | ' + ab.title; $rootScope.pageTitle = ab.shortName + ' | ' + ab.title;
@ -576,18 +576,23 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
} }
}; };
$rootScope.scrollToBottom = function() { $rootScope.scrollWithBuffer = function(nonIncremental) {
// FIXME doesn't work if the settimeout runs without a short delay // First, get scrolling status *before* modification
var scroll = function() { // This is required to determine where we were in the buffer pre-change
var readmarker = document.getElementById('readmarker');
if(readmarker) {
readmarker.scrollIntoView();
}else{
var bl = document.getElementById('bufferlines'); var bl = document.getElementById('bufferlines');
var sTop = bl.scrollTop;
var sVal = bl.scrollHeight - bl.clientHeight; var sVal = bl.scrollHeight - bl.clientHeight;
if(sTop < sVal) {
bl.scrollTop = sVal; var scroll = function() {
var sTop = bl.scrollTop;
// Determine if we want to scroll at all
if (nonIncremental && sTop < sVal || sTop == sVal) {
var readmarker = document.getElementById('readmarker');
if(nonIncremental && readmarker) {
// Switching channels, scroll to read marker
readmarker.scrollIntoView();
} else {
// New message, scroll with buffer (i.e. to bottom)
bl.scrollTop = bl.scrollHeight - bl.clientHeight;
} }
} }
}; };