diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-23 16:18:43 +0100 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-23 16:18:43 +0100 |
| commit | ecc4a533ccf0c56527b4aaaa94a22a0dddf29fa2 (patch) | |
| tree | 72955c4a30595c4a8f20fbb1672c441a553df4f1 /js/app/controllers | |
| parent | d65fa8090469286396342ff2299b58b79d83f8f3 (diff) | |
use all articles if active feed is null
Diffstat (limited to 'js/app/controllers')
| -rw-r--r-- | js/app/controllers/controllers.coffee | 6 | ||||
| -rw-r--r-- | js/app/controllers/itemcontroller.coffee | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/js/app/controllers/controllers.coffee b/js/app/controllers/controllers.coffee index 55566f7d0..b3a246fda 100644 --- a/js/app/controllers/controllers.coffee +++ b/js/app/controllers/controllers.coffee @@ -36,8 +36,8 @@ angular.module('News').controller 'FeedController', ] angular.module('News').controller 'ItemController', -['$scope', '_ItemController', 'ItemModel', -($scope, _ItemController, ItemModel)-> +['$scope', '_ItemController', 'ItemModel', 'FeedLoading', +($scope, _ItemController, ItemModel, FeedLoading)-> - return new _ItemController($scope, ItemModel) + return new _ItemController($scope, ItemModel, FeedLoading) ]
\ No newline at end of file diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee index 3350c674e..163d652ca 100644 --- a/js/app/controllers/itemcontroller.coffee +++ b/js/app/controllers/itemcontroller.coffee @@ -25,7 +25,10 @@ angular.module('News').factory '_ItemController', -> class ItemController - constructor: (@$scope, @itemModel) -> + constructor: (@$scope, @itemModel, @feedLoading) -> + + @$scope.isLoading = => + return @feedLoading.isLoading() return ItemController
\ No newline at end of file |