summaryrefslogtreecommitdiffstats
path: root/js/public
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-05 11:22:38 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-05 11:22:38 +0200
commitf8451ca565c07cfe42d5cf5a9d3d02cba4f2d773 (patch)
tree18ad7d2e5bb804e28e3e5be122349d0bbbdbebc5 /js/public
parent76b3dcd712b9bce4b94be58a07c8dbe584ee8f2f (diff)
bring back show all button
Diffstat (limited to 'js/public')
-rw-r--r--js/public/app.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/js/public/app.js b/js/public/app.js
index 20d687649..944f99b7f 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -171,8 +171,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
]);
angular.module('News').controller('FeedController', [
- '$scope', '_FeedController', 'Persistence', 'FolderBl', 'FeedBl', 'unreadCountFormatter', function($scope, _FeedController, Persistence, FolderBl, FeedBl, unreadCountFormatter) {
- return new _FeedController($scope, Persistence, FolderBl, FeedBl, unreadCountFormatter);
+ '$scope', '_FeedController', 'Persistence', 'FolderBl', 'FeedBl', 'SubscriptionsBl', 'StarredBl', 'unreadCountFormatter', function($scope, _FeedController, Persistence, FolderBl, FeedBl, SubscriptionsBl, StarredBl, unreadCountFormatter) {
+ return new _FeedController($scope, Persistence, FolderBl, FeedBl, SubscriptionsBl, StarredBl, unreadCountFormatter);
}
]);
@@ -214,17 +214,21 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
var FeedController;
FeedController = (function() {
- function FeedController($scope, _persistence, _folderBl, _feedBl, _unreadCountFormatter) {
+ function FeedController($scope, _persistence, _folderBl, _feedBl, _subscriptionsBl, _starredBl, _unreadCountFormatter) {
var _this = this;
this.$scope = $scope;
this._persistence = _persistence;
this._folderBl = _folderBl;
this._feedBl = _feedBl;
+ this._subscriptionsBl = _subscriptionsBl;
+ this._starredBl = _starredBl;
this._unreadCountFormatter = _unreadCountFormatter;
this._isAddingFolder = false;
this._isAddingFeed = false;
this.$scope.folderBl = this._folderBl;
this.$scope.feedBl = this._feedBl;
+ this.$scope.subscriptionsBl = this._subscriptionsBl;
+ this.$scope.starredBl = this._starredBl;
this.$scope.unreadCountFormatter = this._unreadCountFormatter;
this.$scope.isAddingFolder = function() {
return _this._isAddingFolder;
@@ -642,6 +646,10 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
}
};
+ FeedBl.prototype.isShowAll = function() {
+ return this._showAll.getShowAll();
+ };
+
FeedBl.prototype.getAll = function() {
return this._feedModel.getAll();
};