LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

(js) Remove calls to deprecated methods

Browse source 
$http.success and $http.error are deprecated.
This commit is contained in:
Francis Lachapelle 2015-12-14 12:16:47 -05:00
parent 5a1816a5d4
commit bbb9f31c29
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
UI/WebServerResources/js/Common/Authentication.service.js
View file

@ -122,7 +122,7 @@
language: language, language: language,
rememberLogin: rememberLogin rememberLogin: rememberLogin
} }
}).success(function(data, status) { }).then(function(data, status) {
// Make sure browser's cookies are enabled // Make sure browser's cookies are enabled
var loginCookie = readLoginCookie(); var loginCookie = readLoginCookie();
if (!loginCookie) { if (!loginCookie) {
@ -146,7 +146,7 @@
d.resolve(redirectUrl(username, domain)); d.resolve(redirectUrl(username, domain));
} }
} }
}).error(function(data, status) { }, function(data, status) {
var msg, perr; var msg, perr;
if (data && data.LDAPPasswordPolicyError) { if (data && data.LDAPPasswordPolicyError) {
perr = data.LDAPPasswordPolicyError; perr = data.LDAPPasswordPolicyError;
@ -179,9 +179,7 @@
userName: loginCookie[0], userName: loginCookie[0],
password: loginCookie[1], password: loginCookie[1],
newPassword: newPassword } newPassword: newPassword }
}).success(function(data, status) { }).then(d.resolve, function(data, status) {
d.resolve();
}).error(function(data, status) {
var error, var error,
perr = data.LDAPPasswordPolicyError; perr = data.LDAPPasswordPolicyError;

22
UI/WebServerResources/js/Common/Resource.service.js
View file

@ -75,11 +75,11 @@
url: path, url: path,
params: params params: params
}) })
.success(deferred.resolve) .then(deferred.resolve,
.error(function(data, status) { function(data, status) {
if (status == 404) if (status == 404)
return deferred.reject(); return deferred.reject();
}); });
return deferred.promise; return deferred.promise;
}; };
@ -96,8 +96,7 @@
this._http this._http
.get(path) .get(path)
.success(deferred.resolve) .then(deferred.resolve, deferred.reject);
.error(deferred.reject);
return deferred.promise; return deferred.promise;
}; };
@ -116,8 +115,7 @@
this._http this._http
.post(path, { name: name }) .post(path, { name: name })
.success(deferred.resolve) .then(deferred.resolve, deferred.reject);
.error(deferred.reject);
return deferred.promise; return deferred.promise;
}; };
@ -137,8 +135,7 @@
this._http this._http
.post(path, data) .post(path, data)
.success(deferred.resolve) .then(deferred.resolve, deferred.reject);
.error(deferred.reject);
return deferred.promise; return deferred.promise;
}; };
@ -168,8 +165,7 @@
this._http this._http
.get(path) .get(path)
.success(deferred.resolve) .then(deferred.resolve, deferred.reject);
.error(deferred.reject);
return deferred.promise; return deferred.promise;
}; };