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

Make allLinesFetched an attribute of buffer

Browse source 
Remove noMoreLines from the rootScope.
This commit is contained in:
David Cormier 2014-02-27 21:50:50 -05:00
parent 892dac5fbc
commit c4dc74ca8d
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -232,7 +232,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
<table ng-class="{'notimestamp':notimestamp}"> <table ng-class="{'notimestamp':notimestamp}">
<tbody> <tbody>
<tr class="bufferline"> <tr class="bufferline">
<td ng-hide="noMoreLines" colspan="3"> <td ng-hide="activeBuffer().allLinesFetched" colspan="3">
<a class="fetchmorelines" ng-click="fetchMoreLines()" ng-hide="loadingLines">Fetch more lines</a> <a class="fetchmorelines" ng-click="fetchMoreLines()" ng-hide="loadingLines">Fetch more lines</a>
<span ng-show="loadingLines">Fetching more lines...</span> <span ng-show="loadingLines">Fetching more lines...</span>
</td> </td>

7
js/glowingbear.js
View file

@ -450,11 +450,11 @@ function($rootScope,
} }
// We request more lines, but didn't get more. No more lines! // We request more lines, but didn't get more. No more lines!
if (oldLength === buffer.lines.length) { if (oldLength === buffer.lines.length) {
$rootScope.noMoreLines = true; buffer.allLinesFetched = true;
} }
// We requested more lines than we got, no more lines. // We requested more lines than we got, no more lines.
if (linesReceivedCount < numLines) { if (linesReceivedCount < numLines) {
$rootScope.noMoreLines = true; buffer.allLinesFetched = true;
} }
$rootScope.loadingLines = false; $rootScope.loadingLines = false;
// Scroll read marker to the center of the screen // Scroll read marker to the center of the screen
@ -594,9 +594,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$rootScope.$on('activeBufferChanged', function() { $rootScope.$on('activeBufferChanged', function() {
$rootScope.scrollWithBuffer(true); $rootScope.scrollWithBuffer(true);
// Reset no more lines
$rootScope.noMoreLines = false;
var ab = models.getActiveBuffer(); var ab = models.getActiveBuffer();
if (ab.requestedLines < $scope.lines) { if (ab.requestedLines < $scope.lines) {
// 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