Merge pull request #1113 from AStove/master

Prevent errors when scrolling non existant history
codeql
Lorenz Hübschle-Schneider 5 years ago committed by GitHub
commit 574dd49c09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      js/inputbar.js

@ -477,7 +477,7 @@ weechat.directive('inputBar', function() {
// Arrow up -> go up in history // Arrow up -> go up in history
if ($event.type === "keydown" && code === 38 && document.activeElement === inputNode) { if ($event.type === "keydown" && code === 38 && document.activeElement === inputNode) {
caretPos = inputNode.selectionStart; caretPos = inputNode.selectionStart;
if ($scope.command.slice(0, caretPos).indexOf("\n") !== -1) { if (!$scope.command || $scope.command.slice(0, caretPos).indexOf("\n") !== -1) {
return false; return false;
} }
$scope.command = models.getActiveBuffer().getHistoryUp($scope.command); $scope.command = models.getActiveBuffer().getHistoryUp($scope.command);
@ -494,7 +494,7 @@ weechat.directive('inputBar', function() {
// Arrow down -> go down in history // Arrow down -> go down in history
if ($event.type === "keydown" && code === 40 && document.activeElement === inputNode) { if ($event.type === "keydown" && code === 40 && document.activeElement === inputNode) {
caretPos = inputNode.selectionStart; caretPos = inputNode.selectionStart;
if ($scope.command.slice(caretPos).indexOf("\n") !== -1) { if (!$scope.command || $scope.command.slice(caretPos).indexOf("\n") !== -1) {
return false; return false;
} }
$scope.command = models.getActiveBuffer().getHistoryDown($scope.command); $scope.command = models.getActiveBuffer().getHistoryDown($scope.command);

Loading…
Cancel
Save