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

little refactoring

Browse Source
This commit is contained in:
Athou
2013-05-29 10:48:47 +02:00
parent e6cf48d4f6
commit 2c6c432e7f
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -725,33 +725,34 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
}
};
var _currentIndex = function() {
if (!$scope.current) {
return -1;
}
for (var i = 0; i < $scope.entries.length; i++) {
if ($scope.current == $scope.entries[i]) {
return i;
var getCurrentIndex = function() {
var index = -1;
if ($scope.current) {
for (var i = 0; i < $scope.entries.length; i++) {
if ($scope.current == $scope.entries[i]) {
index = i;
break;
}
}
}
return -1;
return index;
};
var _getNextEntry = function() {
var index = _currentIndex();
var getNextEntry = function() {
var index = getCurrentIndex();
if (index >= 0) {
index = index + 1;
if (index < $scope.entries.length) {
return $scope.entries[index];
}
}
} else if ($scope.entries.length > 0) {
return $scope.entries[0];
}
return null;
};
var _getPreviousEntry = function() {
var index = _currentIndex();
var getPreviousEntry = function() {
var index = getCurrentIndex();
if (index >= 1) {
return $scope.entries[index - 1];
}
@@ -759,21 +760,21 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
};
var openNextEntry = function(event) {
var entry = _getNextEntry();
var entry = getNextEntry();
if (entry) {
$scope.entryClicked(entry, event);
}
};
var openPreviousEntry = function(event) {
var entry = _getPreviousEntry();
var entry = getPreviousEntry();
if (entry) {
$scope.entryClicked(entry, event);
}
};
var focusNextEntry = function(event) {
var entry = _getNextEntry();
var entry = getNextEntry();
if (entry) {
$scope.navigationMode = 'click';
$scope.current = entry;
@@ -781,7 +782,7 @@ function($scope, $stateParams, $http, $route, $window, EntryService, SettingsSer
};
var focusPreviousEntry = function(event) {
var entry = _getPreviousEntry();
var entry = getPreviousEntry();
if (entry) {
$scope.navigationMode = 'click';
$scope.current = entry;