yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes angularHelper.rejectedPromise since that is built into angular already

Browse Source
This commit is contained in:
Shannon
2018-04-10 10:52:39 +10:00
parent 584209c38d
commit a23e36ffd2
5 changed files with 17 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js
View File

@@ -71,7 +71,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
performLogin: function (username, password) {
if (!username || !password) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'Username or password cannot be empty'
});
}
@@ -125,7 +125,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
performRequestPasswordReset: function (email) {
if (!email) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'Email address cannot be empty'
});
}
@@ -135,7 +135,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
// be done properly.
var emailRegex = /\S+@\S+\.\S+/;
if (!emailRegex.test(email)) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'Email address is not valid'
});
}
@@ -173,13 +173,13 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
performValidatePasswordResetCode: function (userId, resetCode) {
if (!userId) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'User Id cannot be empty'
});
}
if (!resetCode) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'Reset code cannot be empty'
});
}
@@ -238,25 +238,25 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
performSetPassword: function (userId, password, confirmPassword, resetCode) {
if (userId === undefined || userId === null) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'User Id cannot be empty'
});
}
if (!password) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'Password cannot be empty'
});
}
if (password !== confirmPassword) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'Password and confirmation do not match'
});
}
if (!resetCode) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'Reset code cannot be empty'
});
}
@@ -276,7 +276,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
unlinkLogin: function (loginProvider, providerKey) {
if (!loginProvider || !providerKey) {
return angularHelper.rejectedPromise({
return $q.reject({
errorMsg: 'loginProvider or providerKey cannot be empty'
});
}

4
src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js
View File

@@ -13,7 +13,7 @@ function currentUserResource($q, $http, umbRequestHelper, umbDataFormatter) {
saveTourStatus: function (tourStatus) {
if (!tourStatus) {
return angularHelper.rejectedPromise({ errorMsg: 'tourStatus cannot be empty' });
return $q.reject({ errorMsg: 'tourStatus cannot be empty' });
}
return umbRequestHelper.resourcePromise(
@@ -37,7 +37,7 @@ function currentUserResource($q, $http, umbRequestHelper, umbDataFormatter) {
performSetInvitedUserPassword: function (newPassword) {
if (!newPassword) {
return angularHelper.rejectedPromise({ errorMsg: 'newPassword cannot be empty' });
return $q.reject({ errorMsg: 'newPassword cannot be empty' });
}
return umbRequestHelper.resourcePromise(

23
src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js
View File

@@ -8,26 +8,7 @@
*/
function angularHelper($log, $q) {
return {
/**
* @ngdoc function
* @name umbraco.services.angularHelper#rejectedPromise
* @methodOf umbraco.services.angularHelper
* @function
*
* @description
* In some situations we need to return a promise as a rejection, normally based on invalid data. This
* is a wrapper to do that so we can save on writing a bit of code.
*
* @param {object} objReject The object to send back with the promise rejection
*/
rejectedPromise: function (objReject) {
var deferred = $q.defer();
//return an error object including the error message for UI
deferred.reject(objReject);
return deferred.promise;
},
/**
* @ngdoc function
* @name safeApply
@@ -153,4 +134,4 @@ function angularHelper($log, $q) {
}
};
}
angular.module('umbraco.services').factory('angularHelper', angularHelper);
angular.module('umbraco.services').factory('angularHelper', angularHelper);

4
src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
View File

@@ -89,7 +89,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
});
}
else {
return angularHelper.rejectedPromise();
return $q.reject();
}
},
@@ -152,7 +152,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
//publish action
return {
letter: ch,
labelKey: "buttons_saveAndPublish",
labelKey: args.content.variants && args.content.variants.length > 1 ? "buttons_saveAndPublishMany" : "buttons_saveAndPublish",
handler: args.methods.saveAndPublish,
hotKey: "ctrl+p",
hotKeyWhenHidden: true,

2
src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
View File

@@ -297,7 +297,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
}
//couldn't sync
return angularHelper.rejectedPromise();
return $q.reject();
},
/**