You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/04/06 20:41:46 UTC
[02/15] incubator-trafficcontrol git commit: uses then instead of
deprecated success/error
uses then instead of deprecated success/error
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a7c7e976
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a7c7e976
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a7c7e976
Branch: refs/heads/master
Commit: a7c7e976f41af961b194326f5cbb0d4bc0366c86
Parents: 31a9d1c
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Apr 6 11:45:01 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Thu Apr 6 14:41:34 2017 -0600
----------------------------------------------------------------------
.../ui/app/src/common/api/HttpService.js | 56 +++++++++++---------
.../ui/app/src/common/api/TrafficOpsService.js | 14 ++---
.../ui/app/src/common/api/UserService.js | 16 +++---
3 files changed, 49 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a7c7e976/traffic_ops/experimental/ui/app/src/common/api/HttpService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/HttpService.js b/traffic_ops/experimental/ui/app/src/common/api/HttpService.js
index ab01b9d..a74b7ff 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/HttpService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/HttpService.js
@@ -23,12 +23,14 @@ var HttpService = function($http, $q) {
var deferred = $q.defer();
$http.get(resource)
- .success(function(result) {
- deferred.resolve(result);
- })
- .error(function(fault) {
- deferred.reject(fault);
- });
+ .then(
+ function(result) {
+ deferred.resolve(result);
+ },
+ function(fault) {
+ deferred.reject(fault);
+ }
+ );
return deferred.promise;
};
@@ -37,12 +39,14 @@ var HttpService = function($http, $q) {
var deferred = $q.defer();
$http.post(resource, payload)
- .success(function(result) {
- deferred.resolve(result);
- })
- .error(function(fault) {
- deferred.reject(fault);
- });
+ .then(
+ function(result) {
+ deferred.resolve(result);
+ },
+ function(fault) {
+ deferred.reject(fault);
+ }
+ );
return deferred.promise;
};
@@ -51,12 +55,14 @@ var HttpService = function($http, $q) {
var deferred = $q.defer();
$http.put(resource, payload)
- .success(function(result) {
- deferred.resolve(result.response);
- })
- .error(function(fault) {
- deferred.reject(fault);
- });
+ .then(
+ function(result) {
+ deferred.resolve(result.response);
+ },
+ function(fault) {
+ deferred.reject(fault);
+ }
+ );
return deferred.promise;
};
@@ -65,12 +71,14 @@ var HttpService = function($http, $q) {
var deferred = $q.defer();
$http.delete(resource)
- .success(function(result) {
- deferred.resolve(result.response);
- })
- .error(function(fault) {
- deferred.reject(fault);
- });
+ .then(
+ function(result) {
+ deferred.resolve(result.response);
+ },
+ function(fault) {
+ deferred.reject(fault);
+ }
+ );
return deferred.promise;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a7c7e976/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js b/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
index 63966f1..6c6ff82 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/TrafficOpsService.js
@@ -22,12 +22,14 @@ var TrafficOpsService = function($http, $q) {
this.getReleaseVersionInfo = function() {
var deferred = $q.defer();
$http.get('traffic_ops_release.json')
- .success(function(result) {
- deferred.resolve(result);
- })
- .error(function(fault) {
- deferred.reject(fault);
- });
+ .then(
+ function(result) {
+ deferred.resolve(result);
+ },
+ function(fault) {
+ deferred.reject(fault);
+ }
+ );
return deferred.promise;
};
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a7c7e976/traffic_ops/experimental/ui/app/src/common/api/UserService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/UserService.js b/traffic_ops/experimental/ui/app/src/common/api/UserService.js
index 37c1e78..e4a8a5f 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/UserService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/UserService.js
@@ -35,13 +35,15 @@ var UserService = function(Restangular, $http, $location, $q, authService, locat
);
} else {
$http.get(ENV.api['root'] + "user/current.json")
- .success(function(result) {
- userModel.setUser(result.response);
- deferred.resolve(result.response);
- })
- .error(function(fault) {
- deferred.reject(fault);
- });
+ .then(
+ function(result) {
+ userModel.setUser(result.response);
+ deferred.resolve(result.response);
+ },
+ function(fault) {
+ deferred.reject(fault);
+ }
+ );
return deferred.promise;
}