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

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

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

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