summaryrefslogtreecommitdiffstats
path: root/js/app
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-16 15:43:42 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-16 15:43:42 +0200
commita412194653eb2ba102a678357f5e6351343b8671 (patch)
tree65729b0d4725a33f9797444ae56bd3f016ed6a00 /js/app
parentc20b6d34c73c0bcc697e0d6d62403f57f3f3f5f2 (diff)
implement autopaging and proper loading symbols fix #45 and #26
Diffstat (limited to 'js/app')
-rw-r--r--js/app/controllers/itemcontroller.coffee14
1 files changed, 9 insertions, 5 deletions
diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee
index 0d912b507..fb5b5bfa3 100644
--- a/js/app/controllers/itemcontroller.coffee
+++ b/js/app/controllers/itemcontroller.coffee
@@ -23,14 +23,15 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
angular.module('News').controller 'ItemController',
['$scope', 'ItemBusinessLayer', 'FeedModel', 'FeedLoading', 'FeedBusinessLayer',
-'Language',
+'Language', 'AutoPageLoading',
($scope, ItemBusinessLayer, FeedModel, FeedLoading, FeedBusinessLayer,
-Language) ->
+Language, AutoPageLoading) ->
class ItemController
- constructor: (@_$scope, @_itemBusinessLayer, @_feedModel, @_feedLoading,
- @_feedBusinessLayer, @_language) ->
+ constructor: (@_$scope, @_itemBusinessLayer, @_feedModel,
+ @_feedLoading, @_autoPageLoading, @_feedBusinessLayer,
+ @_language) ->
@_autoPaging = true
@_$scope.itemBusinessLayer = @_itemBusinessLayer
@@ -40,6 +41,9 @@ Language) ->
@_$scope.isLoading = =>
return @_feedLoading.isLoading()
+ @_$scope.isAutoPaging = =>
+ return @_autoPageLoading.isLoading()
+
@_$scope.getFeedTitle = (feedId) =>
feed = @_feedModel.getById(feedId)
if angular.isDefined(feed)
@@ -67,5 +71,5 @@ Language) ->
return new ItemController($scope, ItemBusinessLayer, FeedModel, FeedLoading,
- FeedBusinessLayer, Language)
+ AutoPageLoading, FeedBusinessLayer, Language)
] \ No newline at end of file