From a23e36ffd23efa92134c5e82b643f503a8021547 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 10 Apr 2018 10:52:39 +1000 Subject: [PATCH] Removes angularHelper.rejectedPromise since that is built into angular already --- .../src/common/resources/auth.resource.js | 20 ++++++++-------- .../common/resources/currentuser.resource.js | 4 ++-- .../common/services/angularhelper.service.js | 23 ++----------------- .../services/contenteditinghelper.service.js | 4 ++-- .../src/common/services/navigation.service.js | 2 +- 5 files changed, 17 insertions(+), 36 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js index 3680b32245..d29aa0218c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/auth.resource.js @@ -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' }); } diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js index 0a6b3cd6bc..32e9683dd8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/currentuser.resource.js @@ -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( diff --git a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js index fcc3cd59b1..fb4d8216e3 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/angularhelper.service.js @@ -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); \ No newline at end of file +angular.module('umbraco.services').factory('angularHelper', angularHelper); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js index 66030da052..fa384d92e8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js @@ -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, diff --git a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js index f775e35934..d3250ee64b 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js @@ -297,7 +297,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo } //couldn't sync - return angularHelper.rejectedPromise(); + return $q.reject(); }, /**