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

force load more items when focusing the last item in the list, the infinite scroll does not trigger if the last article is too long

Browse Source
This commit is contained in:
Athou
2013-06-09 11:21:57 +02:00
parent 01ec50271e
commit abe0785789
1 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -763,52 +763,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
});
}
};
$scope.isOpen = SettingsService.settings.viewMode == 'expanded';
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();
}
} else {
$scope.mark(entry, true);
}
};
$scope.entryClicked = function(entry, event) {
$scope.navigationMode = 'click';
openEntry(entry, event);
};
$scope.bodyClicked = function(entry, event) {
if (SettingsService.settings.viewMode == 'expanded' && $scope.current != entry) {
$scope.entryClicked(entry, event);
}
};
$scope.noop = function(event) {
if (!event.ctrlKey && event.which != 2) {
event.preventDefault();
event.stopPropagation();
}
};
var getCurrentIndex = function() {
var index = -1;
if ($scope.current) {
@@ -871,6 +826,56 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
}
};
$scope.isOpen = SettingsService.settings.viewMode == 'expanded';
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();
}
} else {
$scope.mark(entry, true);
}
if (getCurrentIndex() == $scope.entries.length - 1) {
$scope.loadMoreEntries();
}
};
$scope.entryClicked = function(entry, event) {
$scope.navigationMode = 'click';
openEntry(entry, event);
};
$scope.bodyClicked = function(entry, event) {
if (SettingsService.settings.viewMode == 'expanded' && $scope.current != entry) {
$scope.entryClicked(entry, event);
}
};
$scope.noop = function(event) {
if (!event.ctrlKey && event.which != 2) {
event.preventDefault();
event.stopPropagation();
}
};
$scope.onScroll = function(entry) {
$scope.navigationMode = 'scroll';
if (SettingsService.settings.viewMode == 'expanded') {