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

Merge pull request #256 from lorenzhs/doubletap

Browse source 
Double-tap escape to disconnect
This commit is contained in:
David Cormier 2014-04-19 09:57:41 -04:00
commit af06d61627
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
index.html
View file

@ -113,7 +113,7 @@
<li>ALT-a: Focus on next buffer with activity</li> <li>ALT-a: Focus on next buffer with activity</li>
<li>ALT-&lt;: Switch to previous buffer</li> <li>ALT-&lt;: Switch to previous buffer</li>
<li>ALT-g: Focus on buffer list filter</li> <li>ALT-g: Focus on buffer list filter</li>
<li>Esc: disconnect</li> <li>Esc-Esc: disconnect (double-tap)</li>
<li>arrow keys: history navigation</li> <li>arrow keys: history navigation</li>
</ul> </ul>
</div> </div>

10
js/glowingbear.js
View file

@ -1080,7 +1080,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
if ($rootScope.connected) { if ($rootScope.connected) {
event.preventDefault(); event.preventDefault();
// Chrome requires us to set this or it will not show the dialog // Chrome requires us to set this or it will not show the dialog
event.returnValue = "You have an active connection to your WeeChat relay. Please disconnect using the button in the top-right corner or by pressing the Escape key."; event.returnValue = "You have an active connection to your WeeChat relay. Please disconnect using the button in the top-right corner or by double-tapping the Escape key.";
} }
$scope.favico.reset(); $scope.favico.reset();
}; };
@ -1273,10 +1273,14 @@ weechat.directive('inputBar', function() {
} }
} }
// Escape -> disconnect // Double-tap Escape -> disconnect
if (code === 27) { if (code === 27) {
$event.preventDefault(); $event.preventDefault();
connection.disconnect(); if (typeof $scope.lastEscape !== "undefined" && (Date.now() - $scope.lastEscape) <= 500) {
// Double-tap
connection.disconnect();
}
$scope.lastEscape = Date.now();
return true; return true;
} }