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

Merge pull request #283 from glowing-bear/fixsearch 

Don't send input bar contents on buffer switch
This commit is contained in:
David Cormier 2014-05-05 10:41:49 -04:00
parent 3499998764 84270655ee
commit 9121407ddd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/glowingbear.js
View File

@ -703,7 +703,12 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$scope.search = ''; $scope.search = '';
if (!$rootScope.isMobileUi()) { if (!$rootScope.isMobileUi()) {
// This needs to happen asynchronously to prevent the enter key handler
// of the input bar to be triggered on buffer switch via the search.
// Otherwise its current contents would be sent to the new buffer
setTimeout(function() {
document.getElementById('sendMessage').focus(); document.getElementById('sendMessage').focus();
}, 0);
} }
}); });
@ -1371,7 +1376,7 @@ weechat.directive('inputBar', function() {
// Enter to submit, shift-enter for newline // Enter to submit, shift-enter for newline
// //
if (code == 13 && !$event.shiftKey) { if (code == 13 && !$event.shiftKey && document.activeElement === inputNode) {
$event.preventDefault(); $event.preventDefault();
$scope.sendMessage(); $scope.sendMessage();
return true; return true;