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 6D304200B3C for ; Wed, 13 Jul 2016 12:02:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6C019160A6E; Wed, 13 Jul 2016 10:02:13 +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 588BC160A8E for ; Wed, 13 Jul 2016 12:02:12 +0200 (CEST) Received: (qmail 84190 invoked by uid 500); 13 Jul 2016 10:02:11 -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 83865 invoked by uid 99); 13 Jul 2016 10:02:11 -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; Wed, 13 Jul 2016 10:02:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1DFB9ED317; Wed, 13 Jul 2016 10:02:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Wed, 13 Jul 2016 10:02:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/11] ignite git commit: Don't show placeholder for false, 0 value. archived-at: Wed, 13 Jul 2016 10:02:13 -0000 Don't show placeholder for false, 0 value. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aebbcc64 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aebbcc64 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aebbcc64 Branch: refs/heads/ignite-3262 Commit: aebbcc64cdc8fbf6269bc9c5147fe8c980a163dd Parents: 61c106c Author: Andrey Novikov Authored: Mon Jul 11 17:24:13 2016 +0700 Committer: Andrey Novikov Committed: Mon Jul 11 17:24:13 2016 +0700 ---------------------------------------------------------------------- .../app/modules/form/field/bs-select-placeholder.directive.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/aebbcc64/modules/web-console/src/main/js/app/modules/form/field/bs-select-placeholder.directive.js ---------------------------------------------------------------------- diff --git a/modules/web-console/src/main/js/app/modules/form/field/bs-select-placeholder.directive.js b/modules/web-console/src/main/js/app/modules/form/field/bs-select-placeholder.directive.js index 035fed4..83f438d 100644 --- a/modules/web-console/src/main/js/app/modules/form/field/bs-select-placeholder.directive.js +++ b/modules/web-console/src/main/js/app/modules/form/field/bs-select-placeholder.directive.js @@ -28,12 +28,13 @@ export default ['bsSelect', [() => { const value = ngModel.$viewValue; - if (value && (!attrs.multiple || value.length)) - $element.removeClass('placeholder'); - else { + if (_.isNil(value) || (attrs.multiple && !value.length)) { $element.html(attrs.placeholder); + $element.addClass('placeholder'); } + else + $element.removeClass('placeholder'); }; };