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

bookmarklet for next unread item

Browse Source
This commit is contained in:
Athou
2013-05-19 16:24:56 +02:00
parent fb1df96d29
commit eb198b74b0
8 changed files with 107 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -936,6 +936,16 @@ function($scope, $location, $state, AdminSettingsService) {
};
}]);
module.controller('HelpController', [ '$scope', 'CategoryService',
'AnalyticsService',
function($scope, CategoryService, AnalyticsService) {
AnalyticsService.track();
$scope.CategoryService = CategoryService;
$scope.categoryId = 'all';
} ]);
module.controller('FooterController', [ '$scope', function($scope) {
var baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf('#'));
@@ -943,4 +953,4 @@ module.controller('FooterController', [ '$scope', function($scope) {
$scope.subToMeUrl = baseUrl + 'rest/feed/subscribe?url={feed}';
$scope.subToMeName = hostname.indexOf('www.commafeed.com') !== -1 ? 'CommaFeed' : 'CommaFeed (' + hostname + ')';
} ]);
}]);

7
src/main/webapp/js/main.js
View File

@@ -30,11 +30,6 @@ app.config([ '$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpPro
$httpProvider.responseInterceptors.push(interceptor);
var trackCtrl = [ 'AnalyticsService', function(AnalyticsService) {
AnalyticsService.track();
} ];
$stateProvider.state('feeds', {
'abstract' : true,
url : '/feeds',
@@ -63,7 +58,7 @@ app.config([ '$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpPro
$stateProvider.state('feeds.help', {
url : '/help',
templateUrl : 'templates/feeds.help.html',
controller : trackCtrl
controller : 'HelpController'
});
$stateProvider.state('feeds.settings', {
url : '/settings',