fix autofocus when loading unread articles and initial view

5 files changed, 508 insertions, 424 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 391186d45..145d0285a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+owncloud-news (1.808)
+* Also focus article area when clicking on all unread link
+* Autofocus article area by default on load
+
 owncloud-news (1.807)
 * Don't crash if an HttpException occurs in the python updater
 * Add API call to rename a feed
diff --git a/js/app/directives/autofocus.coffee b/js/app/directives/autofocus.coffee
new file mode 100644
index 000000000..98621b65f
--- /dev/null
+++ b/js/app/directives/autofocus.coffee
@@ -0,0 +1,6 @@
+angular.module('News').directive 'newsAutoFocus', ->
+	directive =
+		restrict: 'A'
+		link: (scope, elm, attrs) ->
+			$(window).load ->
+				$(elm).focus()
diff --git a/js/public/app.js b/js/public/app.js
index d77220b72..344303d60 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -10,7 +10,8 @@
  */
 
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -30,8 +31,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News', ['OC', 'ui']).config(function($provide) {
@@ -66,7 +66,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -86,8 +87,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').directive('newsAudio', function() {
@@ -118,7 +118,24 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+(function() {
+  angular.module('News').directive('newsAutoFocus', function() {
+    var directive;
+    return directive = {
+      restrict: 'A',
+      link: function(scope, elm, attrs) {
+        return $(window).load(function() {
+          return $(elm).focus();
+        });
+      }
+    };
+  });
+
+}).call(this);
+
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -138,8 +155,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').directive('droppable', [
@@ -169,7 +185,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -189,8 +206,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').directive('itemShortcuts', [
@@ -312,7 +328,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -332,8 +349,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').directive('newsClickScroll', [
@@ -361,7 +377,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -381,8 +398,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   var markingRead, scrolling;
@@ -444,7 +460,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -464,8 +481,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').directive('newsPullToRefresh', [
@@ -495,7 +511,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -515,8 +532,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').directive('newsTranslate', function() {
@@ -533,7 +549,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -553,8 +570,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').directive('undoNotification', [
@@ -596,7 +612,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -616,8 +633,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').controller('AppController', [
@@ -625,16 +641,17 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
       var AppController;
       AppController = (function() {
         function AppController(_$scope, _persistence, _feedBusinessLayer) {
-          var successCallback,
-            _this = this;
+          var successCallback;
           this._$scope = _$scope;
           this._persistence = _persistence;
           this._feedBusinessLayer = _feedBusinessLayer;
           this._$scope.initialized = false;
           this._$scope.feedBusinessLayer = this._feedBusinessLayer;
-          successCallback = function() {
-            return _this._$scope.initialized = true;
-          };
+          successCallback = (function(_this) {
+            return function() {
+              return _this._$scope.initialized = true;
+            };
+          })(this);
           this._persistence.init().then(successCallback);
         }
 
@@ -647,7 +664,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -667,8 +685,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').controller('FeedController', [
@@ -676,7 +693,6 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
       var FeedController;
       FeedController = (function() {
         function FeedController(_$scope, _persistence, _folderBusinessLayer, _feedBusinessLayer, _subscriptionsBusinessLayer, _starredBusinessLayer, _unreadCountFormatter, _activeFeed, _feedType, _$window) {
-          var _this = this;
           this._$scope = _$scope;
           this._persistence = _persistence;
           this._folderBusinessLayer = _folderBusinessLayer;
@@ -694,83 +710,95 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
           this._$scope.subscriptionsBusinessLayer = this._subscriptionsBusinessLayer;
           this._$scope.starredBusinessLayer = this._starredBusinessLayer;
           this._$scope.unreadCountFormatter = this._unreadCountFormatter;
-          this._$scope.getTotalUnreadCount = function() {
-            var appName, count, title, titleCount;
-            count = _this._subscriptionsBusinessLayer.getUnreadCount(0);
-            if (_this._$scope.translations && _this._$scope.translations.appName) {
-              appName = _this._$scope.translations.appName;
-            } else {
-              appName = '';
-            }
-            if (count > 0) {
-              titleCount = _this._unreadCountFormatter(count);
-              title = appName + ' (' + titleCount + ') | ownCloud';
-            } else {
-              title = appName + ' | ownCloud';
-            }
-            if (_this._$window.document.title !== title) {
-              _this._$window.document.title = title;
-            }
-            return count;
-          };
-          this._$scope.isAddingFolder = function() {
-            return _this._isAddingFolder;
-          };
-          this._$scope.isAddingFeed = function() {
-            return _this._isAddingFeed;
-          };
-          this._$scope.addFeed = function(feedUrl, parentFolderId) {
-            var error;
-            if (parentFolderId == null) {
-              parentFolderId = 0;
-            }
-            _this._$scope.feedExistsError = false;
-            try {
-              _this._isAddingFeed = true;
-              if (parentFolderId !== 0) {
-                _this._folderBusinessLayer.open(parentFolderId);
+          this._$scope.getTotalUnreadCount = (function(_this) {
+            return function() {
+              var appName, count, title, titleCount;
+              count = _this._subscriptionsBusinessLayer.getUnreadCount(0);
+              if (_this._$scope.translations && _this._$scope.translations.appName) {
+                appName = _this._$scope.translations.appName;
+              } else {
+                appName = '';
+              }
+              if (count > 0) {
+                titleCount = _this._unreadCountFormatter(count);
+                title = appName + ' (' + titleCount + ') | ownCloud';
+              } else {
+                title = appName + ' | ownCloud';
               }
-              _this._$scope.feedUrl = '';
-              return _this._feedBusinessLayer.create(feedUrl, parentFolderId, function(data) {
-                _this._isAddingFeed = false;
-                return _this._feedBusinessLayer.load(data['feeds'][0].id);
-              }, function() {
+              if (_this._$window.document.title !== title) {
+                _this._$window.document.title = title;
+              }
+              return count;
+            };
+          })(this);
+          this._$scope.isAddingFolder = (function(_this) {
+            return function() {
+              return _this._isAddingFolder;
+            };
+          })(this);
+          this._$scope.isAddingFeed = (function(_this) {
+            return function() {
+              return _this._isAddingFeed;
+            };
+          })(this);
+          this._$scope.addFeed = (function(_this) {
+            return function(feedUrl, parentFolderId) {
+              var error;
+              if (parentFolderId == null) {
+                parentFolderId = 0;
+              }
+              _this._$scope.feedExistsError = false;
+              try {
+                _this._isAddingFeed = true;
+                if (parentFolderId !== 0) {
+                  _this._folderBusinessLayer.open(parentFolderId);
+                }
+                _this._$scope.feedUrl = '';
+                return _this._feedBusinessLayer.create(feedUrl, parentFolderId, function(data) {
+                  _this._isAddingFeed = false;
+                  return _this._feedBusinessLayer.load(data['feeds'][0].id);
+                }, function() {
+                  return _this._isAddingFeed = false;
+                });
+              } catch (_error) {
+                error = _error;
+                if (error instanceof _ExistsError) {
+                  _this._$scope.feedExistsError = true;
+                }
                 return _this._isAddingFeed = false;
-              });
-            } catch (_error) {
-              error = _error;
-              if (error instanceof _ExistsError) {
-                _this._$scope.feedExistsError = true;
               }
-              return _this._isAddingFeed = false;
-            }
-          };
-          this._$scope.addFolder = function(folderName) {
-            var error;
-            _this._$scope.folderExistsError = false;
-            try {
-              _this._isAddingFolder = true;
-              return _this._folderBusinessLayer.create(folderName, function(data) {
-                var activeId;
-                _this._$scope.folderName = '';
-                _this._$scope.addNewFolder = false;
-                _this._isAddingFolder = false;
-                activeId = data['folders'][0].id;
-                return _this._$scope.folderId = _this._folderBusinessLayer.getById(activeId);
-              }, function() {
+            };
+          })(this);
+          this._$scope.addFolder = (function(_this) {
+            return function(folderName) {
+              var error;
+              _this._$scope.folderExistsError = false;
+              try {
+                _this._isAddingFolder = true;
+                return _this._folderBusinessLayer.create(folderName, function(data) {
+                  var activeId;
+                  _this._$scope.folderName = '';
+                  _this._$scope.addNewFolder = false;
+                  _this._isAddingFolder = false;
+                  activeId = data['folders'][0].id;
+                  return _this._$scope.folderId = _this._folderBusinessLayer.getById(activeId);
+                }, function() {
+                  return _this._isAddingFolder = false;
+                });
+              } catch (_error) {
+                error = _error;
+                if (error instanceof _ExistsError) {
+                  _this._$scope.folderExistsError = true;
+                }
                 return _this._isAddingFolder = false;
-              });
-            } catch (_error) {
-              error = _error;
-              if (error instanceof _ExistsError) {
-                _this._$scope.folderExistsError = true;
               }
-              return _this._isAddingFolder = false;
-            }
-          };
-          this._$scope.$on('moveFeedToFolder', function(scope, data) {
-            return _this._feedBusinessLayer.move(data.feedId, data.folderId);
-          });
+            };
+          })(this);
+          this._$scope.$on('moveFeedToFolder', (function(_this) {
+            return function(scope, data) {
+              return _this._feedBusinessLayer.move(data.feedId, data.folderId);
+            };
+          })(this));
         }
 
         return FeedController;
@@ -782,7 +810,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -802,8 +831,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').controller('ItemController', [
@@ -811,7 +839,6 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
       var ItemController;
       ItemController = (function() {
         function ItemController(_$scope, _itemBusinessLayer, _feedModel, _feedLoading, _autoPageLoading, _feedBusinessLayer, _language, _compact) {
-          var _this = this;
           this._$scope = _$scope;
           this._itemBusinessLayer = _itemBusinessLayer;
           this._feedModel = _feedModel;
@@ -823,60 +850,80 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
           this._autoPaging = true;
           this._$scope.itemBusinessLayer = this._itemBusinessLayer;
           this._$scope.feedBusinessLayer = this._feedBusinessLayer;
-          this._$scope.edit = function(feedId) {
-            var feed;
-            feed = _this._feedModel.getById(feedId);
-            feed.editing = true;
-            return feed.originalValue = feed.title;
-          };
-          this._$scope.cancel = function(feedId) {
-            var feed;
-            feed = _this._feedModel.getById(feedId);
-            feed.editing = false;
-            return feed.title = feed.originalValue;
-          };
-          this._$scope.isLoading = function() {
-            return _this._feedLoading.isLoading();
-          };
-          this._$scope.isAutoPaging = function() {
-            return _this._autoPageLoading.isLoading();
-          };
-          this._$scope.getFeedTitle = function(feedId) {
-            var feed;
-            feed = _this._feedModel.getById(feedId);
-            if (angular.isDefined(feed)) {
-              return feed.title;
-            } else {
-              return '';
-            }
-          };
-          this._$scope.getRelativeDate = function(date) {
-            if (date) {
-              return _this._language.getMomentFromTimestamp(date).fromNow();
-            } else {
-              return '';
-            }
-          };
-          this._$scope.loadNew = function() {
-            _this._$scope.refresh = true;
-            return _this._itemBusinessLayer.loadNew(function() {
-              return _this._$scope.refresh = false;
-            });
-          };
-          this._$scope.$on('readItem', function(scope, data) {
-            return _this._itemBusinessLayer.setRead(data);
-          });
-          this._$scope.$on('autoPage', function() {
-            if (_this._autoPaging) {
-              _this._autoPaging = false;
-              return _this._itemBusinessLayer.loadNext(function(data) {
-                return _this._autoPaging = true;
+          this._$scope.edit = (function(_this) {
+            return function(feedId) {
+              var feed;
+              feed = _this._feedModel.getById(feedId);
+              feed.editing = true;
+              return feed.originalValue = feed.title;
+            };
+          })(this);
+          this._$scope.cancel = (function(_this) {
+            return function(feedId) {
+              var feed;
+              feed = _this._feedModel.getById(feedId);
+              feed.editing = false;
+              return feed.title = feed.originalValue;
+            };
+          })(this);
+          this._$scope.isLoading = (function(_this) {
+            return function() {
+              return _this._feedLoading.isLoading();
+            };
+          })(this);
+          this._$scope.isAutoPaging = (function(_this) {
+            return function() {
+              return _this._autoPageLoading.isLoading();
+            };
+          })(this);
+          this._$scope.getFeedTitle = (function(_this) {
+            return function(feedId) {
+              var feed;
+              feed = _this._feedModel.getById(feedId);
+              if (angular.isDefined(feed)) {
+                return feed.title;
+              } else {
+                return '';
+              }
+            };
+          })(this);
+          this._$scope.getRelativeDate = (function(_this) {
+            return function(date) {
+              if (date) {
+                return _this._language.getMomentFromTimestamp(date).fromNow();
+              } else {
+                return '';
+              }
+            };
+          })(this);
+          this._$scope.loadNew = (function(_this) {
+            return function() {
+              _this._$scope.refresh = true;
+              return _this._itemBusinessLayer.loadNew(function() {
+                return _this._$scope.refresh = false;
               });
-            }
-          });
-          this._$scope.isCompactView = function() {
-            return _this._compact.isCompact();
-          };
+            };
+          })(this);
+          this._$scope.$on('readItem', (function(_this) {
+            return function(scope, data) {
+              return _this._itemBusinessLayer.setRead(data);
+            };
+          })(this));
+          this._$scope.$on('autoPage', (function(_this) {
+            return function() {
+              if (_this._autoPaging) {
+                _this._autoPaging = false;
+                return _this._itemBusinessLayer.loadNext(function(data) {
+                  return _this._autoPaging = true;
+                });
+              }
+            };
+          })(this));
+          this._$scope.isCompactView = (function(_this) {
+            return function() {
+              return _this._compact.isCompact();
+            };
+          })(this);
         }
 
         return ItemController;
@@ -888,7 +935,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -908,8 +956,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').controller('SettingsController', [
@@ -953,7 +1000,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -973,18 +1021,17 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').factory('ActiveFeed', function() {
     var ActiveFeed;
     ActiveFeed = (function() {
       function ActiveFeed() {
+
         /*
         			Default value is all feeds
-        */
-
+         */
         this._id = 0;
         this._type = 3;
       }
@@ -1010,7 +1057,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -1030,8 +1078,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').factory('_BusinessLayer', function() {
@@ -1046,12 +1093,13 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
       }
 
       BusinessLayer.prototype.load = function(id) {
-        var _this = this;
         this._$rootScope.$broadcast('loadingNewItems');
         this._itemModel.clear();
-        this._persistence.getItems(this._type, id, 0, function() {
-          return _this._$rootScope.$broadcast('loadedNewItems');
-        });
+        this._persistence.getItems(this._type, id, 0, (function(_this) {
+          return function() {
+            return _this._$rootScope.$broadcast('loadedNewItems');
+          };
+        })(this));
         return this._activeFeed.handle({
           id: id,
           type: this._type
@@ -1070,7 +1118,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -1090,8 +1139,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   var __hasProp = {}.hasOwnProperty,
@@ -1130,15 +1178,16 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
         };
 
         FeedBusinessLayer.prototype["delete"] = function(feedId) {
-          var data, feed,
-            _this = this;
+          var data, feed;
           feed = this._feedModel.removeById(feedId);
           data = {
-            undoCallback: function() {
-              return _this._persistence.restoreFeed(feedId, function() {
-                return this._persistence.getAllFeeds();
-              });
-            },
+            undoCallback: (function(_this) {
+              return function() {
+                return _this._persistence.restoreFeed(feedId, function() {
+                  return this._persistence.getAllFeeds();
+                });
+              };
+            })(this),
             caption: feed.title
           };
           this._$rootScope.$broadcast('undoMessage', data);
@@ -1201,16 +1250,17 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
         };
 
         FeedBusinessLayer.prototype.setShowAll = function(showAll) {
-          var callback,
-            _this = this;
+          var callback;
           this._showAll.setShowAll(showAll);
-          callback = function() {
-            _this._itemModel.clear();
-            _this._newLoading.increase();
-            return _this._persistence.getItems(_this._activeFeed.getType(), _this._activeFeed.getId(), 0, function() {
-              return _this._newLoading.decrease();
-            });
-          };
+          callback = (function(_this) {
+            return function() {
+              _this._itemModel.clear();
+              _this._newLoading.increase();
+              return _this._persistence.getItems(_this._activeFeed.getType(), _this._activeFeed.getId(), 0, function() {
+                return _this._newLoading.decrease();
+              });
+            };
+          })(this);
           if (showAll) {
             return this._persistence.userSettingsReadShow(callback);
           } else {
@@ -1298,7 +1348,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -1318,8 +1369,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   var __hasProp = {}.hasOwnProperty,
@@ -1347,8 +1397,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
         };
 
         FolderBusinessLayer.prototype["delete"] = function(folderId) {
-          var data, feed, feeds, folder, _i, _len, _ref,
-            _this = this;
+          var data, feed, feeds, folder, _i, _len, _ref;
           feeds = [];
           _ref = this._feedBusinessLayer.getFeedsOfFolder(folderId);
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
@@ -1357,12 +1406,14 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
           }
           folder = this._folderModel.removeById(folderId);
           data = {
-            undoCallback: function() {
-              return _this._persistence.restoreFolder(folderId, function() {
-                _this._persistence.getAllFeeds();
-                return _this._persistence.getAllFolders();
-              });
-            },
+            undoCallback: (function(_this) {
+              return function() {
+                return _this._persistence.restoreFolder(folderId, function() {
+                  _this._persistence.getAllFeeds();
+                  return _this._persistence.getAllFolders();
+                });
+              };
+            })(this),
             caption: folder.name
           };
           this._$rootScope.$broadcast('undoMessage', data);
@@ -1512,40 +1563,41 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
         };
 
         FolderBusinessLayer.prototype._importElement = function(opml, parentFolderId) {
-          var item, _i, _len, _ref, _results,
-            _this = this;
+          var item, _i, _len, _ref, _results;
           _ref = opml.getItems();
           _results = [];
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
             item = _ref[_i];
-            _results.push((function(item) {
-              var error, folder;
-              if (item.isFolder()) {
-                try {
-                  return _this.create(item.getName(), function(data) {
-                    return _this._importElement(item, data.folders[0].id);
-                  });
-                } catch (_error) {
-                  error = _error;
-                  if (error instanceof _ExistsError) {
-                    folder = _this._folderModel.getByName(item.getName());
-                    _this.open(folder.id);
-                    return _this._importElement(item, folder.id);
-                  } else {
-                    return console.info(error);
+            _results.push((function(_this) {
+              return function(item) {
+                var error, folder;
+                if (item.isFolder()) {
+                  try {
+                    return _this.create(item.getName(), function(data) {
+                      return _this._importElement(item, data.folders[0].id);
+                    });
+                  } catch (_error) {
+                    error = _error;
+                    if (error instanceof _ExistsError) {
+                      folder = _this._folderModel.getByName(item.getName());
+                      _this.open(folder.id);
+                      return _this._importElement(item, folder.id);
+                    } else {
+                      return console.info(error);
+                    }
                   }
-                }
-              } else {
-                try {
-                  return _this._feedBusinessLayer.create(item.getUrl(), parentFolderId);
-                } catch (_error) {
-                  error = _error;
-                  if (!error instanceof _ExistsError) {
-                    return console.info(error);
+                } else {
+                  try {
+                    return _this._feedBusinessLayer.create(item.getUrl(), parentFolderId);
+                  } catch (_error) {
+                    error = _error;
+                    if (!error instanceof _ExistsError) {
+                      return console.info(error);
+                    }
                   }
                 }
-              }
-            })(item));
+              };
+            })(this)(item));
           }
           return _results;
         };
@@ -1559,7 +1611,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -1579,8 +1632,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   angular.module('News').factory('ItemBusinessLayer', [
@@ -1708,7 +1760,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -1728,8 +1781,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   var __hasProp = {}.hasOwnProperty,
@@ -1775,7 +1827,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7.1
+
 /*
 
 ownCloud - News
@@ -1795,8 +1848,7 @@ GNU AFFERO GENERAL PUBLIC LICENSE for more details.
 
 You should have received a copy of the GNU Affero General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ */
 
 (function() {
   var __hasProp = {}.hasOwnProperty,
@@ -1860,7 +1912,8 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 }).call(this);
 
-// Generated by CoffeeScript 1.6.3
+// Generated by CoffeeScript 1.7