diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 03:41:28 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-05-19 03:41:28 +0200 |
| commit | 928ccf49fb5c6deb405358ad38221b0cd205fb6b (patch) | |
| tree | db5b4921eed3fe8193dbcaeb07cefb7e6c714c34 /js/app | |
| parent | 90584316b8f275fcad904b644676544eb0322636 (diff) | |
periodically update
Diffstat (limited to 'js/app')
| -rw-r--r-- | js/app/Config.js | 6 | ||||
| -rw-r--r-- | js/app/Run.js | 20 |
2 files changed, 18 insertions, 8 deletions
diff --git a/js/app/Config.js b/js/app/Config.js index 67a5e7215..290726343 100644 --- a/js/app/Config.js +++ b/js/app/Config.js @@ -11,8 +11,10 @@ app.config(function ($routeProvider, $provide, $httpProvider) { 'use strict'; // constants + $provide.constant('CONFIG', { + REFRESH_RATE: 60 // refresh feeds every 60 seconds + }); $provide.constant('BASE_URL', OC.generateUrl('/apps/news')); - $provide.constant('FEED_TYPE', { FEED: 0, FOLDER: 1, @@ -38,7 +40,7 @@ app.config(function ($routeProvider, $provide, $httpProvider) { // routing $routeProvider .when('/items', { - controller: 'ItemsController', + controller: 'ItemController', templateUrl: 'content.html', resolve: {} }) diff --git a/js/app/Run.js b/js/app/Run.js index 936a03b9d..ad5d80ca1 100644 --- a/js/app/Run.js +++ b/js/app/Run.js @@ -7,8 +7,9 @@ * @author Bernhard Posselt <dev@bernhard-posselt.com> * @copyright Bernhard Posselt 2014 */ -app.run(function ($rootScope, $location, $http, $q, Loading, Item, Feed, Folder, - Settings, Publisher, BASE_URL, FEED_TYPE) { +app.run(function ($rootScope, $location, $http, $q, $interval, Loading, Item, + Feed, Folder, Settings, Publisher, BASE_URL, FEED_TYPE, + CONFIG) { 'use strict'; // show Loading screen @@ -57,10 +58,17 @@ app.run(function ($rootScope, $location, $http, $q, Loading, Item, Feed, Folder, activeFeedDeferred.resolve(); }); - - $q.all([settingsDeferred.promise, activeFeedDeferred.promise]).then(function () { - Loading.setLoading('global', false); - }); + // disable loading if all initial requests finished + $q.all([settingsDeferred.promise, activeFeedDeferred.promise]) + .then(function () { + Loading.setLoading('global', false); + }); + + // refresh feeds and folders + $interval(function () { + $http.get(BASE_URL + '/feeds'); + $http.get(BASE_URL + '/folders'); + }, CONFIG.REFRESH_RATE * 1000); $rootScope.$on('$routeChangeStart', function () { |