diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-04 13:48:44 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-10-04 13:48:44 +0200 |
commit | 8ecc37bafc86fdf954ea5606b87f04a7bae54570 (patch) | |
tree | 502c8bfb5fac95ff25ecaeec88bdeaf56e76115a /js/build/app.js | |
parent | 96c7439c7372d603e36412c39d6b2b8948565199 (diff) |
fix #624
Diffstat (limited to 'js/build/app.js')
-rw-r--r-- | js/build/app.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/js/build/app.js b/js/build/app.js index f4a91bec3..683637145 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -356,6 +356,10 @@ app.controller('ContentController', } }; + this.refresh = function () { + $route.reload(); + }; + }]); app.controller('NavigationController', ["$route", "FEED_TYPE", "FeedResource", "FolderResource", "ItemResource", "SettingsResource", "Publisher", "$rootScope", "$location", "$q", function ($route, FEED_TYPE, FeedResource, FolderResource, ItemResource, @@ -2106,7 +2110,7 @@ app.directive('newsFocus', ["$timeout", "$interpolate", function ($timeout, $int }; }]); -app.directive('newsPullToRefresh', ["$route", "$rootScope", function ($route, $rootScope) { +app.directive('newsPullToRefresh', ["$rootScope", function ($rootScope) { 'use strict'; var scrolled = false; @@ -2114,7 +2118,7 @@ app.directive('newsPullToRefresh', ["$route", "$rootScope", function ($route, $r return { restrict: 'A', scope: { - 'newsTimeout': '&' + newsPullToRefresh: '=' }, link: function (scope, element) { @@ -2122,11 +2126,12 @@ app.directive('newsPullToRefresh', ["$route", "$rootScope", function ($route, $r // so reset the var $rootScope.$on('$routeChangeStart', function () { scrolled = false; + scope.newsPullToRefresh = false; }); element.on('scroll', function () { if (element.scrollTop() === 0 && scrolled) { - $route.reload(); + scope.newsPullToRefresh = true; } scrolled = true; }); |