garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

propagate keyboard event

Browse Source
This commit is contained in:
Athou
2013-03-29 06:58:13 +01:00
parent 24e5f718cd
commit 9c303b9ed0
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,13 +157,9 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http, $route,
if (!entry.read) {
$scope.mark(entry, true);
}
if (!event || (!event.ctrlKey && event.which != 2)) {
if (event) {
event.preventDefault();
event.stopPropagation();
}
console.log($scope.current)
console.log(entry)
if (!event.ctrlKey && event.which != 2) {
event.preventDefault();
event.stopPropagation();
if ($scope.current != entry) {
$scope.isOpen = true;
} else {
@@ -173,7 +169,7 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http, $route,
}
}
var openNextEntry = function() {
var openNextEntry = function(event) {
var entry = null;
if ($scope.current) {
var index;
@@ -191,11 +187,11 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http, $route,
entry = $scope.entries[0];
}
if (entry) {
$scope.entryClicked(entry);
$scope.entryClicked(entry, event);
}
};
var openPreviousEntry = function() {
var openPreviousEntry = function(event) {
var entry = null;
if ($scope.current) {
var index;
@@ -211,11 +207,17 @@ module.controller('FeedListCtrl', function($scope, $routeParams, $http, $route,
}
}
if (entry) {
$scope.entryClicked(entry);
$scope.entryClicked(entry, event);
}
};
Mousetrap.bind('space', openNextEntry);
Mousetrap.bind('j', openNextEntry);
Mousetrap.bind('k', openPreviousEntry);
Mousetrap.bind('space', function(e) {
openNextEntry(e);
});
Mousetrap.bind('j', function(e) {
openNextEntry(e);
});
Mousetrap.bind('k', function(e) {
openPreviousEntry(e);
});
});