From be02c1e1cd1b1547b3d087be9a96ea7a12f2b46c Mon Sep 17 00:00:00 2001 From: Seth Daugherty Date: Fri, 4 Jan 2019 18:59:55 -0500 Subject: [PATCH 1/2] 20078 Add support for validation message callback - Adds a type check for message just before attempting to process validation params on it - Resolves the callback if it was one using the validation rule for the 'this' context --- .../Magento/Ui/view/base/web/js/lib/validation/validator.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js index be8fd2ce9fcef..577b5eabb0350 100644 --- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js +++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js @@ -48,6 +48,10 @@ define([ params : [params]; + if (typeof message === "function") { + message = message.call(rule); + } + message = params.reduce(function (msg, param, idx) { return msg.replace(new RegExp('\\{' + idx + '\\}', 'g'), param); }, message); From dc8d2d5a316ec9013a97d5850f78d39446351131 Mon Sep 17 00:00:00 2001 From: Seth Daugherty Date: Mon, 7 Jan 2019 11:16:58 -0500 Subject: [PATCH 2/2] Update quotes - Change double quotes to single quotes --- .../Magento/Ui/view/base/web/js/lib/validation/validator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js index 577b5eabb0350..8ebbf88775b86 100644 --- a/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js +++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/validator.js @@ -48,7 +48,7 @@ define([ params : [params]; - if (typeof message === "function") { + if (typeof message === 'function') { message = message.call(rule); }