IGNITE-843 Fixed placeholders for dropdowns.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ba1c934 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ba1c934 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ba1c934 Branch: refs/heads/ignite-843-rc2 Commit: 3ba1c934ab00835facbf89f8900e4f12ca91622a Parents: 85d956d Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Tue Dec 1 11:30:15 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Tue Dec 1 11:30:15 2015 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/views/includes/controls.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3ba1c934/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index 7504231..0bf14f4 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -165,7 +165,7 @@ mixin details-row - var detailMdl = 'getModel(backupItem, detail)[detail.model]'; - var detailCommon = {'ng-model': detailMdl, 'ng-required': 'detail.required'}; - var detailDisabled = '{{detail.disabled}}' - - var dropdownPlaceholder = {'ng-class': '{placeholder: !' + detailMdl + ' || ' + detailMdl + '.length == 0}'} + - var dropdownPlaceholder = {'ng-class': '{placeholder: !(' + detailMdl + ' && ' + detailMdl + '.length > 0)}'} - var customValidators = {'ng-attr-ipaddress': '{{detail.ipaddress}}'} @@ -313,7 +313,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource) - var fieldRequiredClass = '{true: "required"}[field.required || required(field)]' - var fieldHide = '{{field.hide}}' - var fieldDisabled = {'ng-disabled': '{{field.disabled}}'} - - var dropdownPlaceholder = {'ng-class': '{placeholder: !' + fieldMdl + ' || ' + fieldMdl + '.length == 0}'} + - var dropdownPlaceholder = {'ng-class': '{placeholder: !(' + fieldMdl + ' && ' + fieldMdl + '.length > 0)}'} div(ng-switch='field.type') div(ng-switch-when='label')