summaryrefslogtreecommitdiffstats
path: root/js/public
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2013-12-19 17:47:10 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2013-12-19 17:47:10 +0100
commit015fbb80fcbdf942dc42efe9f1edb53a71a1b9f8 (patch)
tree287d78cc5159a403436dde80a977d5054c015bd6 /js/public
parent41bf672b4f3878f99b6248ef2567565c21c2d276 (diff)
add compact view, fix #267, merry christmas ;D
Diffstat (limited to 'js/public')
-rw-r--r--js/public/app.js16
1 files changed, 13 insertions, 3 deletions
diff --git a/js/public/app.js b/js/public/app.js
index f49f2546c..caaf5dc52 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -867,6 +867,16 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
this._$scope.isCompactView = function() {
return _this._compact.isCompact();
};
+ this._$scope.is = {
+ active: 0
+ };
+ this._$scope.toggleOpen = function(id) {
+ if (id === _this._$scope.is.active) {
+ return _this._$scope.is.active = 0;
+ } else {
+ return _this._$scope.is.active = id;
+ }
+ };
}
return ItemController;
@@ -2722,9 +2732,6 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
var successCallback,
_this = this;
this.deferred = $q.defer();
- this.getActiveFeed(function() {
- return _this.getItems(_this._activeFeed.getType(), _this._activeFeed.getId());
- });
this.getAllFolders();
successCallback = function() {
return _this.deferred.resolve();
@@ -2733,6 +2740,9 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
this.userSettingsRead();
this.userSettingsLanguage();
this.userSettingsIsCompact();
+ this.getActiveFeed(function() {
+ return _this.getItems(_this._activeFeed.getType(), _this._activeFeed.getId());
+ });
return this.deferred.promise;
};