diff options
author | Daniel Schaal <daniel@schaal.email> | 2017-06-08 05:10:34 +0200 |
---|---|---|
committer | Daniel Schaal <daniel@schaal.email> | 2017-06-10 11:19:07 +0200 |
commit | 7cebc63defdd640b822132a1e24b489345ac06e9 (patch) | |
tree | 34fb03b39d0a2a472aae12f0c7eae2454834f63d /js/app | |
parent | 2eddf6242be77e21a4a9d05b56dc9cc0125472c3 (diff) |
Use regular promise for http calls
Diffstat (limited to 'js/app')
-rw-r--r-- | js/app/Config.js | 27 | ||||
-rw-r--r-- | js/app/Run.js | 55 |
2 files changed, 36 insertions, 46 deletions
diff --git a/js/app/Config.js b/js/app/Config.js index 2152615c6..4df6c9b00 100644 --- a/js/app/Config.js +++ b/js/app/Config.js @@ -92,12 +92,10 @@ app.config(function ($routeProvider, $provide, $httpProvider) { var oldestFirst = SettingsResource.get('oldestFirst'); var search = $location.search().search || ''; - var deferred = $q.defer(); - // if those two values are null it means we did not receive // the settings request from the server so dont query the server if (showAll === null || oldestFirst === null) { - deferred.resolve({}); + return {}; } else { var parameters = { type: type, @@ -125,16 +123,14 @@ app.config(function ($routeProvider, $provide, $httpProvider) { } } - $http({ + return $http({ url: BASE_URL + '/items', method: 'GET', params: parameters - }).success(function (data) { - deferred.resolve(data); + }).then(function (response) { + return response.data; }); } - - return deferred.promise; } }; }; @@ -143,16 +139,15 @@ app.config(function ($routeProvider, $provide, $httpProvider) { return { sites: /* @ngInject */ function ( $http, $q, BASE_URL, $location, Publisher, SettingsResource) { - var deferred = $q.defer(); - // always use the code from the url var language = $location.search().lang; if (!language) { language = SettingsResource.get('language'); } - $http.get(BASE_URL + '/settings').then(function (data) { - Publisher.publishAll(data); + return $http.get( + BASE_URL + '/settings').then(function (response) { + Publisher.publishAll(response.data); // get url and strip trailing slashes var url = SettingsResource.get('exploreUrl') @@ -166,13 +161,9 @@ app.config(function ($routeProvider, $provide, $httpProvider) { return $http.get(defaultExploreUrl); }); - }).then(function (data) { - deferred.resolve(data.data); - }).catch(function () { - deferred.reject(); + }).then(function (response) { + return response.data; }); - - return deferred.promise; } }; }; diff --git a/js/app/Run.js b/js/app/Run.js index 2a9842104..eb4ec76fd 100644 --- a/js/app/Run.js +++ b/js/app/Run.js @@ -24,25 +24,25 @@ app.run(function ($rootScope, $location, $http, $q, $interval, $route, Loading, Publisher.subscribe(SettingsResource).toChannels(['settings']); // load feeds, settings and last read feed - var settingsDeferred = $q.defer(); - $http.get(BASE_URL + '/settings').success(function (data) { - Publisher.publishAll(data); - settingsDeferred.resolve(); + var settingsPromise = $http.get(BASE_URL + '/settings').then( + function (response) { + Publisher.publishAll(response.data); + return response.data; }); - var activeFeedDeferred = $q.defer(); var path = $location.path(); - $http.get(BASE_URL + '/feeds/active').success(function (data) { + var activeFeedPromise = $http.get(BASE_URL + '/feeds/active') + .then(function (response) { var url; - switch (data.activeFeed.type) { + switch (response.data.activeFeed.type) { case FEED_TYPE.FEED: - url = '/items/feeds/' + data.activeFeed.id; + url = '/items/feeds/' + response.data.activeFeed.id; break; case FEED_TYPE.FOLDER: - url = '/items/folders/' + data.activeFeed.id; + url = '/items/folders/' + response.data.activeFeed.id; break; case FEED_TYPE.STARRED: @@ -63,26 +63,25 @@ app.run(function ($rootScope, $location, $http, $q, $interval, $route, Loading, $location.path(url); } - activeFeedDeferred.resolve(); + return response.data; }); - var feedDeferred = $q.defer(); var feeds; - $http.get(BASE_URL + '/feeds').success(function (data) { - feeds = data; - feedDeferred.resolve(); + var feedPromise = $http.get(BASE_URL + '/feeds').then(function (response) { + feeds = response.data; + return feeds; }); - var folderDeferred = $q.defer(); var folders; - $http.get(BASE_URL + '/folders').success(function (data) { - folders = data; - folderDeferred.resolve(); + var folderPromise = $http.get(BASE_URL + '/folders') + .then(function (response) { + folders = response.data; + return folders; }); $q.all([ - feedDeferred.promise, - folderDeferred.promise + feedPromise, + folderPromise ]).then(function () { // first publish feeds to correctly update the folder resource unread // cache @@ -96,10 +95,10 @@ app.run(function ($rootScope, $location, $http, $q, $interval, $route, Loading, // disable loading if all initial requests finished $q.all( [ - settingsDeferred.promise, - activeFeedDeferred.promise, - feedDeferred.promise, - folderDeferred.promise + settingsPromise, + activeFeedPromise, + feedPromise, + folderPromise ] ) .then(function () { @@ -109,11 +108,11 @@ app.run(function ($rootScope, $location, $http, $q, $interval, $route, Loading, // refresh feeds and folders $interval(function () { - $http.get(BASE_URL + '/feeds').success(function (data) { - Publisher.publishAll(data); + $http.get(BASE_URL + '/feeds').then(function (response) { + Publisher.publishAll(response.data); }); - $http.get(BASE_URL + '/folders').success(function (data) { - Publisher.publishAll(data); + $http.get(BASE_URL + '/folders').then(function (response) { + Publisher.publishAll(response.data); }); }, REFRESH_RATE * 1000); |