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

Rename 'lines' to 'lines_per_screen'

Browse source
This commit is contained in:
David Cormier 2014-06-26 22:36:30 -04:00
parent 984ceaf4e5
commit 48a07ee1fe
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
js/glowingbear.js
View file

@ -700,7 +700,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
var ab = models.getActiveBuffer(); var ab = models.getActiveBuffer();
// trim lines to 2 screenfuls + 10 lines // trim lines to 2 screenfuls + 10 lines
ab.lines.splice(0, ab.lines.length - (2 * $scope.lines + 10)); ab.lines.splice(0, ab.lines.length - (2 * $scope.lines_per_screen + 10));
ab.requestedLines = ab.lines.length; ab.requestedLines = ab.lines.length;
$scope.bufferlines = ab.lines; $scope.bufferlines = ab.lines;
@ -718,10 +718,10 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$scope.showNicklist = $scope.updateShowNicklist(); $scope.showNicklist = $scope.updateShowNicklist();
} }
if (ab.requestedLines < $scope.lines) { if (ab.requestedLines < $scope.lines_per_screen) {
// buffer has not been loaded, but some lines may already be present if they arrived after we connected // buffer has not been loaded, but some lines may already be present if they arrived after we connected
// try to determine how many lines to fetch // try to determine how many lines to fetch
var numLines = $scope.lines; // that's a screenful plus 10 lines var numLines = $scope.lines_per_screen; // that's a screenful plus 10 lines
unreadSum += 10; // let's just add a 10 line safety margin here again unreadSum += 10; // let's just add a 10 line safety margin here again
if (unreadSum > numLines) { if (unreadSum > numLines) {
// request up to 4*(screenful + 10 lines) // request up to 4*(screenful + 10 lines)
@ -923,7 +923,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Fetch 10 lines more than theoretically needed so that scrolling up will correctly trigger the loading of more lines // Fetch 10 lines more than theoretically needed so that scrolling up will correctly trigger the loading of more lines
// Also, some lines might be hidden, so it's probably better to have a bit of buffer there // Also, some lines might be hidden, so it's probably better to have a bit of buffer there
var numLines = Math.ceil(areaHeight/lineHeight + 10); var numLines = Math.ceil(areaHeight/lineHeight + 10);
$scope.lines = numLines; $scope.lines_per_screen = numLines;
}; };
$scope.calculateNumLines(); $scope.calculateNumLines();
@ -957,7 +957,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$rootScope.loadingLines = false; $rootScope.loadingLines = false;
$scope.fetchMoreLines = function(numLines) { $scope.fetchMoreLines = function(numLines) {
if (!numLines) { if (!numLines) {
numLines = $scope.lines; numLines = $scope.lines_per_screen;
} }
return connection.fetchMoreLines(numLines); return connection.fetchMoreLines(numLines);
}; };