diff options
-rw-r--r-- | js/app/Config.js | 8 | ||||
-rw-r--r-- | js/build/app.js | 12 | ||||
-rw-r--r-- | js/controller/ContentController.js | 5 | ||||
-rw-r--r-- | js/tests/unit/controller/ContentControllerSpec.js | 14 |
4 files changed, 13 insertions, 26 deletions
diff --git a/js/app/Config.js b/js/app/Config.js index 17b823218..5aebc3653 100644 --- a/js/app/Config.js +++ b/js/app/Config.js @@ -77,22 +77,22 @@ app.config(function ($routeProvider, $provide, $httpProvider) { $routeProvider .when('/items', { - controller: 'ContentController', + controller: 'ContentController as Content', templateUrl: 'content.html', resolve: getResolve(feedType.SUBSCRIPTIONS) }) .when('/items/starred', { - controller: 'ContentController', + controller: 'ContentController as Content', templateUrl: 'content.html', resolve: getResolve(feedType.STARRED) }) .when('/items/feeds/:id', { - controller: 'ContentController', + controller: 'ContentController as Content', templateUrl: 'content.html', resolve: getResolve(feedType.FEED) }) .when('/items/folders/:id', { - controller: 'ContentController', + controller: 'ContentController as Content', templateUrl: 'content.html', resolve: getResolve(feedType.FOLDER) }) diff --git a/js/build/app.js b/js/build/app.js index 52c6d8d29..e0472f32c 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -66,19 +66,19 @@ var $__build_47_app__ = function () { }; }; $routeProvider.when('/items', { - controller: 'ContentController', + controller: 'ContentController as Content', templateUrl: 'content.html', resolve: getResolve(feedType.SUBSCRIPTIONS) }).when('/items/starred', { - controller: 'ContentController', + controller: 'ContentController as Content', templateUrl: 'content.html', resolve: getResolve(feedType.STARRED) }).when('/items/feeds/:id', { - controller: 'ContentController', + controller: 'ContentController as Content', templateUrl: 'content.html', resolve: getResolve(feedType.FEED) }).when('/items/folders/:id', { - controller: 'ContentController', + controller: 'ContentController as Content', templateUrl: 'content.html', resolve: getResolve(feedType.FOLDER) }).otherwise({ redirectTo: '/items' }); @@ -176,15 +176,13 @@ var $__build_47_app__ = function () { } ]); app.controller('ContentController', [ - '$scope', 'Publisher', 'FeedResource', 'ItemResource', 'SettingsResource', 'data', - function ($scope, Publisher, FeedResource, ItemResource, SettingsResource, data) { + function (Publisher, FeedResource, ItemResource, SettingsResource, data) { 'use strict'; - $scope.Content = this; ItemResource.clear(); Publisher.publishAll(data); this.getItems = function () { diff --git a/js/controller/ContentController.js b/js/controller/ContentController.js index b4f2f6498..e1beff98d 100644 --- a/js/controller/ContentController.js +++ b/js/controller/ContentController.js @@ -8,12 +8,9 @@ * @copyright Bernhard Posselt 2014 */ app.controller('ContentController', -function ($scope, Publisher, FeedResource, ItemResource, SettingsResource, - data) { +function (Publisher, FeedResource, ItemResource, SettingsResource, data) { 'use strict'; - $scope.Content = this; - ItemResource.clear(); // distribute data to models based on key diff --git a/js/tests/unit/controller/ContentControllerSpec.js b/js/tests/unit/controller/ContentControllerSpec.js index 94cb09f21..ac7c6f1a8 100644 --- a/js/tests/unit/controller/ContentControllerSpec.js +++ b/js/tests/unit/controller/ContentControllerSpec.js @@ -10,16 +10,11 @@ describe('ContentController', () => { 'use strict'; - let scope; beforeEach(module('News', ($provide) => { $provide.value('BASE_URL', 'base'); })); - beforeEach(inject(($rootScope) => { - scope = $rootScope.$new(); - })); - it('should publish data to models', inject(($controller, Publisher, FeedResource, ItemResource) => { @@ -34,7 +29,6 @@ describe('ContentController', () => { {id: 4} ] }, - $scope: scope }); expect(controller.getItems().length).toBe(2); @@ -48,7 +42,6 @@ describe('ContentController', () => { $controller('ContentController', { data: {}, - $scope: scope }); expect(ItemResource.clear).toHaveBeenCalled(); @@ -58,17 +51,16 @@ describe('ContentController', () => { it('should return order by', inject(($controller, SettingsResource) => { - $controller('ContentController', { + let ctrl = $controller('ContentController', { SettingsResource: SettingsResource, - $scope: scope, data: {}, }); - expect(scope.Content.orderBy()).toBe('id'); + expect(ctrl.orderBy()).toBe('id'); SettingsResource.set('oldestFirst', true); - expect(scope.Content.orderBy()).toBe('-id'); + expect(ctrl.orderBy()).toBe('-id'); })); }); |