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

prevent scrolling when using middle click

Browse Source
This commit is contained in:
Athou
2013-06-15 16:13:15 +02:00
parent 05893088c7
commit 293ed52929
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -830,28 +830,20 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
var openEntry = function(entry, event) {
if (event && event.which === 3) {
// right click
return;
}
if (!event || (!event.ctrlKey && event.which != 2)) {
if ($scope.current != entry || SettingsService.settings.viewMode == 'expanded') {
$scope.isOpen = true;
} else {
$scope.isOpen = !$scope.isOpen;
}
if ($scope.isOpen) {
$scope.mark(entry, true);
}
$scope.current = entry;
if (event) {
event.preventDefault();
event.stopPropagation();
}
if ($scope.current != entry || SettingsService.settings.viewMode == 'expanded') {
$scope.isOpen = true;
} else {
$scope.isOpen = !$scope.isOpen;
}
if ($scope.isOpen) {
$scope.mark(entry, true);
}
$scope.current = entry;
if (event) {
event.preventDefault();
event.stopPropagation();
}
if (getCurrentIndex() == $scope.entries.length - 1) {
$scope.loadMoreEntries();
@@ -859,8 +851,17 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
};
$scope.entryClicked = function(entry, event) {
$scope.navigationMode = 'click';
openEntry(entry, event);
if (event && event.which === 3) {
// right click
return;
}
if (!event || (!event.ctrlKey && event.which != 2)) {
$scope.navigationMode = 'click';
openEntry(entry, event);
} else {
$scope.mark(entry, true);
}
};
$scope.bodyClicked = function(entry, event) {