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

Merge pull request #328 from glowing-bear/scroll-on-resize 

Scroll on resize if at the bottom of the bufferlines
This commit is contained in:
David Cormier 2014-06-18 17:37:22 -04:00
parent 7efd441b99 4a04ff8a8f
commit afb5225bc6
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/glowingbear.js
View File

@ -466,7 +466,7 @@ function($rootScope,
// Indicator that we are loading lines, hides "load more lines" link // Indicator that we are loading lines, hides "load more lines" link
$rootScope.loadingLines = true; $rootScope.loadingLines = true;
// Send hdata request to fetch lines for this particular buffer // Send hdata request to fetch lines for this particular buffer
ngWebsockets.send( return ngWebsockets.send(
weeChat.Protocol.formatHdata({ weeChat.Protocol.formatHdata({
// "0x" is important, otherwise it won't work // "0x" is important, otherwise it won't work
path: "buffer:0x" + buffer.id + "/own_lines/last_line(-" + numLines + ")/data", path: "buffer:0x" + buffer.id + "/own_lines/last_line(-" + numLines + ")/data",
@ -718,7 +718,16 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// request up to 4*(screenful + 10 lines) // request up to 4*(screenful + 10 lines)
numLines = Math.min(4*numLines, unreadSum); numLines = Math.min(4*numLines, unreadSum);
} }
$scope.fetchMoreLines(numLines); $scope.fetchMoreLines(numLines).then(
// Update initial scroll position
// Most relevant when first connecting to properly initalise
function() {
$timeout(function() {
var bufferlines = document.getElementById("bufferlines");
$rootScope.originalBufferlinesPosition = bufferlines.scrollTop + bufferlines.scrollHeight;
});
}
);
} }
$rootScope.updateTitle(ab); $rootScope.updateTitle(ab);
@ -920,6 +929,16 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
} }
$scope.wasMobileUi = $scope.isMobileUi(); $scope.wasMobileUi = $scope.isMobileUi();
$scope.calculateNumLines(); $scope.calculateNumLines();
// if we're scrolled to the bottom, scroll down to the same position after the resize
// most common use case: opening the keyboard on a mobile device
var bufferlines = document.getElementById("bufferlines");
if ($rootScope.originalBufferlinesPosition === bufferlines.scrollHeight + bufferlines.scrollTop) {
$timeout(function() {
bufferlines.scrollTop = bufferlines.scrollHeight;
}, 100);
}
$rootScope.originalBufferlinesPosition = bufferlines.scrollTop + bufferlines.scrollHeight;
} }
}, 100)); }, 100));
@ -929,7 +948,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
if (!numLines) { if (!numLines) {
numLines = $scope.lines; numLines = $scope.lines;
} }
connection.fetchMoreLines(numLines); return connection.fetchMoreLines(numLines);
}; };
$rootScope.scrollWithBuffer = function(nonIncremental) { $rootScope.scrollWithBuffer = function(nonIncremental) {