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

Merge pull request #109 from lorenzhs/scrolling 

Improve scrolling
This commit is contained in:
David Cormier 2014-01-07 10:42:33 -08:00
parent 222419cdcc f38c4b020e
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

31
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
// This is required to determine where we were in the buffer pre-change
var bl = document.getElementById('bufferlines');
var sVal = bl.scrollHeight - bl.clientHeight;
var scroll = function() { var scroll = function() {
var readmarker = document.getElementById('readmarker'); var sTop = bl.scrollTop;
if(readmarker) { // Determine if we want to scroll at all
readmarker.scrollIntoView(); if (nonIncremental && sTop < sVal || sTop == sVal) {
}else{ var readmarker = document.getElementById('readmarker');
var bl = document.getElementById('bufferlines'); if(nonIncremental && readmarker) {
var sTop = bl.scrollTop; // Switching channels, scroll to read marker
var sVal = bl.scrollHeight - bl.clientHeight; readmarker.scrollIntoView();
if(sTop < sVal) { } else {
bl.scrollTop = sVal; // New message, scroll with buffer (i.e. to bottom)
bl.scrollTop = bl.scrollHeight - bl.clientHeight;
} }
} }
}; };