Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 33C02200D62 for ; Mon, 13 Nov 2017 10:52:00 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 326A6160BF3; Mon, 13 Nov 2017 09:52:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 466AA160C07 for ; Mon, 13 Nov 2017 10:51:59 +0100 (CET) Received: (qmail 42393 invoked by uid 500); 13 Nov 2017 09:51:58 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 41970 invoked by uid 99); 13 Nov 2017 09:51:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Nov 2017 09:51:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4662CF5E13; Mon, 13 Nov 2017 09:51:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 13 Nov 2017 09:52:17 -0000 Message-Id: <2bebecdc438a4208adf7fcab264804f9@git.apache.org> In-Reply-To: <7fe468c3a1934aaeaa8a26f0e695af20@git.apache.org> References: <7fe468c3a1934aaeaa8a26f0e695af20@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [23/28] ignite git commit: IGNITE-6824 Add step validator support to pcScaleNumber directive, add "step" validation message to pc-form-field-size pug mixin. archived-at: Mon, 13 Nov 2017 09:52:00 -0000 IGNITE-6824 Add step validator support to pcScaleNumber directive, add "step" validation message to pc-form-field-size pug mixin. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/250ceb72 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/250ceb72 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/250ceb72 Branch: refs/heads/ignite-zk Commit: 250ceb726d38631282599fb39b3990e66a667922 Parents: 78a8403 Author: Ilya Borisov Authored: Mon Nov 13 13:29:47 2017 +0700 Committer: Andrey Novikov Committed: Mon Nov 13 13:29:47 2017 +0700 ---------------------------------------------------------------------- .../components/page-configure-basic/components/pcbScaleNumber.js | 1 + .../components/page-configure-basic/mixins/pcb-form-field-size.pug | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/250ceb72/modules/web-console/frontend/app/components/page-configure-basic/components/pcbScaleNumber.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-basic/components/pcbScaleNumber.js b/modules/web-console/frontend/app/components/page-configure-basic/components/pcbScaleNumber.js index 93d87ba..663d631 100644 --- a/modules/web-console/frontend/app/components/page-configure-basic/components/pcbScaleNumber.js +++ b/modules/web-console/frontend/app/components/page-configure-basic/components/pcbScaleNumber.js @@ -28,6 +28,7 @@ export default function pcbScaleNumber() { ngModel.$parsers.push(down); ngModel.$validators.min = wrap(ngModel.$validators.min)(up); ngModel.$validators.max = wrap(ngModel.$validators.max)(up); + ngModel.$validators.step = wrap(ngModel.$validators.step)(up); scope.$watch(attr.pcbScaleNumber, (value, old) => { factor = Number(value); http://git-wip-us.apache.org/repos/asf/ignite/blob/250ceb72/modules/web-console/frontend/app/components/page-configure-basic/mixins/pcb-form-field-size.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-configure-basic/mixins/pcb-form-field-size.pug b/modules/web-console/frontend/app/components/page-configure-basic/mixins/pcb-form-field-size.pug index fccd6ca..0cd5d01 100644 --- a/modules/web-console/frontend/app/components/page-configure-basic/mixins/pcb-form-field-size.pug +++ b/modules/web-console/frontend/app/components/page-configure-basic/mixins/pcb-form-field-size.pug @@ -63,6 +63,7 @@ mixin pcb-form-field-size(label, model, name, disabled, required, placeholder, m +pcb-form-field-feedback(form, name, 'min', `Value is less than allowable minimum: ${min}`) +pcb-form-field-feedback(form, name, 'max', `Value is more than allowable maximum: ${max}`) +pcb-form-field-feedback(form, name, 'number', 'Only numbers allowed') + +pcb-form-field-feedback(form, name, 'step', 'Step is invalid') .input-tip +pcb-form-field-input(attributes=attributes)