diff options
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/controllers/controllers.coffee | 10 | ||||
| -rw-r--r-- | js/app/services/persistence.coffee | 23 |
2 files changed, 18 insertions, 15 deletions
diff --git a/js/app/controllers/controllers.coffee b/js/app/controllers/controllers.coffee index b3a246fda..27603ef52 100644 --- a/js/app/controllers/controllers.coffee +++ b/js/app/controllers/controllers.coffee @@ -20,22 +20,22 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>. ### -angular.module('News').controller 'SettingsController', -['$scope', '_SettingsController', +angular.module('News').controller 'SettingsController', +['$scope', '_SettingsController', ($scope, _SettingsController)-> return new _SettingsController($scope) ] -angular.module('News').controller 'FeedController', -['$scope', '_FeedController', 'FolderModel', 'FeedModel', +angular.module('News').controller 'FeedController', +['$scope', '_FeedController', 'FolderModel', 'FeedModel', ($scope, _FeedController, FolderModel, FeedModel)-> return new _FeedController($scope, FolderModel, FeedModel) ] -angular.module('News').controller 'ItemController', +angular.module('News').controller 'ItemController', ['$scope', '_ItemController', 'ItemModel', 'FeedLoading', ($scope, _ItemController, ItemModel, FeedLoading)-> diff --git a/js/app/services/persistence.coffee b/js/app/services/persistence.coffee index 6f75d4601..fab268518 100644 --- a/js/app/services/persistence.coffee +++ b/js/app/services/persistence.coffee @@ -40,10 +40,13 @@ angular.module('News').factory '_Persistence', -> @getItems @_activeFeed.getType(), @_activeFeed.getId(), 0, => @_loading.decrease() - @getAllFolders(@_triggerHideRead) - @getAllFeeds(@_triggerHideRead) - @userSettingsRead(@_triggerHideRead) - @getStarredItems(@_triggerHideRead) + triggerHideRead = => + @_triggerHideRead + + @getAllFolders(triggerHideRead) + @getAllFeeds(triggerHideRead) + @userSettingsRead(triggerHideRead) + @getStarredItems(triggerHideRead) ### @@ -126,7 +129,7 @@ angular.module('News').factory '_Persistence', -> FEED CONTROLLER ### getAllFeeds: (callback) -> - callback or= angular.noop + callback or= -> params = onSuccess: callback @@ -200,7 +203,7 @@ angular.module('News').factory '_Persistence', -> FOLDER CONTROLLER ### getAllFolders: (callback) -> - callback or= angular.noop + callback or= -> params = onSuccess: callback @@ -231,8 +234,8 @@ angular.module('News').factory '_Persistence', -> createFolder: (folderName, parentFolderId=0, onSuccess=null, onFailure=null) -> - onSuccess or= angular.noop - onFailure or= angular.noop + onSuccess or= -> + onFailure or= -> params = data: @@ -287,7 +290,7 @@ angular.module('News').factory '_Persistence', -> ### Gets the configs for read settings ### - callback or= angular.noop + callback or= -> params = onSuccess: callback @@ -308,7 +311,7 @@ angular.module('News').factory '_Persistence', -> @_request.post 'news_usersettings_read_hide' - _trigerHideRead: -> + _triggerHideRead: -> @_$rootScope.$broadcast('triggerHideRead') |