summaryrefslogtreecommitdiffstats
path: root/js/app/controllers
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-15 18:11:38 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-15 18:11:38 +0200
commit94e82411f7def5b3f79df43eb0279142cea19f1e (patch)
treef352530c4689644dcf58c8fcf8a42dc8b0c6fa2c /js/app/controllers
parentc171e9e381e6d7af9c2dd44ff82f9fef381a2e1a (diff)
fix unittest breakage errors in firefox and phantomjs, bump build tools
Diffstat (limited to 'js/app/controllers')
-rw-r--r--js/app/controllers/itemcontroller.coffee7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/app/controllers/itemcontroller.coffee b/js/app/controllers/itemcontroller.coffee
index bdc35c855..a08486d08 100644
--- a/js/app/controllers/itemcontroller.coffee
+++ b/js/app/controllers/itemcontroller.coffee
@@ -34,6 +34,7 @@ Language) ->
@_$scope.itemBusinessLayer = @_itemBusinessLayer
@_$scope.feedBusinessLayer = @_feedBusinessLayer
+
@_$scope.isLoading = =>
return @_feedLoading.isLoading()
@@ -44,6 +45,7 @@ Language) ->
else
return ''
+ # TODO: unittest
@_$scope.getRelativeDate = (date) =>
if date
return @_language.getMomentFromTimestamp(date).fromNow()
@@ -51,6 +53,11 @@ Language) ->
return ''
+ @_$scope.$on 'readItem', (scope, data) =>
+ console.log data
+
+
+
return new ItemController($scope, ItemBusinessLayer, FeedModel, FeedLoading,
FeedBusinessLayer, Language)