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

Merge pull request #1132 from AStove/fixHistoryBug

Browse Source 
Fix unable to use history when input bar empty
This commit is contained in:
Lorenz Hübschle-Schneider 2020-05-18 21:35:49 +02:00 committed by GitHub
commit 84088e5b19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/inputbar.js
View File

@ -632,26 +632,32 @@ weechat.directive('inputBar', function() {
// Arrow up -> go up in history
if ($event.type === "keydown" && code === 38 && document.activeElement === inputNode) {
caretPos = inputNode.selectionStart;
if (!$scope.command || $scope.command.slice(0, caretPos).indexOf("\n") !== -1) {
return false;
// In case of multiline we don't want to do this unless at the first line
if ($scope.command) {
caretPos = inputNode.selectionStart;
if ($scope.command.slice(0, caretPos).indexOf("\n") !== -1) {
return false;
}
}
$scope.command = models.getActiveBuffer().getHistoryUp($scope.command);
// Set cursor to last position. Need 0ms timeout because browser sets cursor
// position to the beginning after this key handler returns.
// Set cursor to last position. Need 1ms (0ms works for chrome) timeout because
// browser sets cursor position to the beginning after this key handler returns.
setTimeout(function() {
if ($scope.command) {
inputNode.setSelectionRange($scope.command.length, $scope.command.length);
}
}, 0);
}, 1);
return true;
}
// Arrow down -> go down in history
if ($event.type === "keydown" && code === 40 && document.activeElement === inputNode) {
caretPos = inputNode.selectionStart;
if (!$scope.command || $scope.command.slice(caretPos).indexOf("\n") !== -1) {
return false;
// In case of multiline we don't want to do this unless it's the last line
if ($scope.command) {
caretPos = inputNode.selectionStart;
if ( $scope.command.slice(caretPos).indexOf("\n") !== -1) {
return false;
}
}
$scope.command = models.getActiveBuffer().getHistoryDown($scope.command);
// We don't need to set the cursor to the rightmost position here, the browser does that for us