You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/03/28 10:47:43 UTC
[03/50] [abbrv] ignite git commit: IGNITE-2840 Additional mixins,
fixed disabled conditions, disable empty dropdown
IGNITE-2840 Additional mixins, fixed disabled conditions, disable empty dropdown
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/51308e66
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/51308e66
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/51308e66
Branch: refs/heads/ignite-2875
Commit: 51308e66e14845ebc01281334bac19e9101cda6d
Parents: 6b017f0
Author: vsisko <vs...@gridgain.com>
Authored: Thu Mar 17 18:29:27 2016 +0700
Committer: vsisko <vs...@gridgain.com>
Committed: Thu Mar 17 18:29:27 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/helpers/jade/mixins.jade | 52 ++++++++++++++++++--
1 file changed, 49 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/51308e66/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade b/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
index e09d5ef..0c4e140 100644
--- a/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
+++ b/modules/control-center-web/src/main/js/app/helpers/jade/mixins.jade
@@ -26,6 +26,34 @@ mixin checkbox(lbl, model, name, tip)
ignite-form-field-tooltip
| !{tip}
+//- Mixin for checkbox with enabled condition.
+mixin checkbox-enabled(lbl, model, name, enabled, tip)
+ ignite-form-field.checkbox
+ ignite-form-field-input-checkbox(
+ data-id=name
+ data-name=name
+ data-ng-model=model
+ data-ng-disabled='!(#{enabled})'
+ )
+ | #{lbl}
+ ignite-form-field-tooltip
+ | !{tip}
+
+//- Mixin for java name field with enabled condition.
+mixin java-class(lbl, model, name, enabled, required, tip)
+ ignite-form-field
+ ignite-form-field-label
+ | #{lbl}
+ ignite-form-field-tooltip
+ | !{tip}
+ ignite-form-field-java-class(
+ data-id=name
+ data-name=name
+ data-ng-model=model
+ data-ng-disabled='!(#{enabled})'
+ data-ng-required=required
+ )
+
//- Mixin for text field.
mixin text-enabled(lbl, model, name, enabled, required, placeholder, tip)
ignite-form-field
@@ -38,7 +66,7 @@ mixin text-enabled(lbl, model, name, enabled, required, placeholder, tip)
data-name=name
data-ng-model=model
data-placeholder=placeholder
- data-ng-disabled='!#{enabled}'
+ data-ng-disabled='!(#{enabled})'
data-ng-required=required
)
@@ -46,6 +74,22 @@ mixin text-enabled(lbl, model, name, enabled, required, placeholder, tip)
mixin text(lbl, model, name, required, placeholder, tip)
+text-enabled(lbl, model, name, 'true', required, placeholder, tip)
+//- Mixin for text field with enabled condition with options.
+mixin text-options(lbl, model, name, options, enabled, placeholder, tip)
+ ignite-form-field
+ ignite-form-field-label
+ | #{lbl}
+ ignite-form-field-tooltip
+ | !{tip}
+ ignite-form-field-input-text(
+ data-id=name
+ data-name=name
+ data-ng-model=model
+ data-options=options
+ data-placeholder=placeholder
+ data-ng-disabled='!(#{enabled})'
+ )
+
//- Mixin for required numeric field.
mixin number-requited(lbl, model, name, required, enabled, placeholder, min, tip)
ignite-form-field
@@ -58,7 +102,7 @@ mixin number-requited(lbl, model, name, required, enabled, placeholder, min, tip
data-name=name
data-ng-model=model
data-ng-required=required
- data-ng-disabled='!#{enabled}'
+ data-ng-disabled='!(#{enabled})'
data-placeholder=placeholder
data-min=min
)
@@ -79,6 +123,7 @@ mixin number-min-max(lbl, model, name, enabled, placeholder, min, max, tip)
data-min=min
data-max=max
)
+
//- Mixin for numeric field.
mixin number(lbl, model, name, enabled, placeholder, min, tip)
+number-requited(lbl, model, name, 'false', enabled, placeholder, min, tip)
@@ -96,7 +141,7 @@ mixin dropdown-required(lbl, model, name, required, enabled, placeholder, option
data-options=options
data-ng-model=model
data-ng-required=required
- data-ng-disabled='!#{enabled}'
+ data-ng-disabled='!(#{enabled})'
data-placeholder=placeholder
)
@@ -119,6 +164,7 @@ mixin dropdown-multiple(lbl, model, name, placeholder, placeholderEmpty, options
data-options=options
data-ng-model=model
data-placeholder='{{ #{options}.length > 0 ? "#{placeholder}" : "#{placeholderEmpty}" }}'
+ data-disabled='!#{options}.length'
)
//- Mixin for table java class field.