Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

show shortcuts on '?' keypress (#52)

Browse Source
This commit is contained in:
Athou
2013-04-21 17:07:34 +02:00
parent 0204dadc3f
commit 0f5cb77502
4 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/webapp/js/controllers.js
View File

@@ -431,22 +431,23 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
}
};
Mousetrap.bind('space', function(e) {
$scope.$apply(function() {
openNextEntry(e);
});
});
Mousetrap.bind('j', function(e) {
$scope.$apply(function() {
openNextEntry(e);
});
});
Mousetrap.bind('shift+space', function(e) {
Mousetrap.bind('k', function(e) {
$scope.$apply(function() {
openPreviousEntry(e);
});
});
Mousetrap.bind('k', function(e) {
Mousetrap.bind('space', function(e) {
$scope.$apply(function() {
openNextEntry(e);
});
});
Mousetrap.bind('shift+space', function(e) {
$scope.$apply(function() {
openPreviousEntry(e);
});
@@ -475,6 +476,11 @@ module.controller('FeedListCtrl', function($scope, $stateParams, $http, $route,
window.open($scope.current.url);
}
});
Mousetrap.bind('?', function(e) {
$scope.$apply(function() {
$scope.shortcutsModal = true;
});
});
$scope.$on('markAll', function(event, args) {
var service = $scope.selectedType == 'feed' ? FeedService

16
src/main/webapp/templates/_shortcuts.html Normal file
View File

@@ -0,0 +1,16 @@
<dl class="dl-horizontal">
<dt>k, space</dt>
<dd>open next entry</dd>
<dt>j, shift+space</dt>
<dd>open previous entry</dd>
<dt>o, enter</dt>
<dd>open/close current entry</dd>
<dt>v</dt>
<dd>open current entry in a new window</dd>
<dt>mouse middleclick</dt>
<dd>open entry in new tab and mark as read</dd>
</dl>

17
src/main/webapp/templates/feeds.help.html
View File

@@ -45,22 +45,7 @@
</div>
<div class="tab-pane" id="shortcuts">
<h3>Keyboard Shortcuts</h3>
<dl class="dl-horizontal">
<dt>k, space</dt>
<dd>open next entry</dd>
<dt>j, shift+space</dt>
<dd>open previous entry</dd>
<dt>o, enter</dt>
<dd>open/close current entry</dd>
<dt>v</dt>
<dd>open current entry in a new window</dd>
<dt>mouse middleclick</dt>
<dd>open entry in new tab and mark as read</dd>
</dl>
<div ng-include="'templates/_shortcuts.html'"></div>
</div>
</div>
</div>

8
src/main/webapp/templates/feeds.view.html
View File

@@ -1,5 +1,4 @@
<div>
<div class="entrylist-header" ui-if="name">
<h3><span>{{name}}&nbsp;</span><span ng-show="name && selectedType == 'category'"> &#187;</span></h3>
</div>
@@ -39,5 +38,12 @@
</div>
</div>
<div class="no-entries" ng-show="name && entries.length == 0 && !busy">"{{name}}" has no unread items.</div>
<div modal="shortcutsModal" close="shortcutsModal=false" options="shortcutsOpts">
<div class="modal-header">
<button type="button" class="close" ng-click="shortcutsModal=false">&times;</button>
<h4>Keyboard shortcuts</h4>
</div>
<div ng-include="'templates/_shortcuts.html'"></div>
</div>
</div>
</div>