Repository: ambari Updated Branches: refs/heads/trunk 888a24daa -> 11950930d
AMBARI-10343. Default marker is hidden for slider when its value equals to minimum or maximum value. (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/11950930 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/11950930 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/11950930 Branch: refs/heads/trunk Commit: 11950930ddc3aae00e537ff2b5e9484576cbf271 Parents: 888a24d Author: Oleg Nechiporenko <[email protected]> Authored: Fri Apr 3 15:52:14 2015 +0300 Committer: Oleg Nechiporenko <[email protected]> Committed: Fri Apr 3 15:52:14 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/widgets.less | 4 ++++ .../common/configs/widgets/slider_config_widget_view.js | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/11950930/ambari-web/app/styles/widgets.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/widgets.less b/ambari-web/app/styles/widgets.less index 1e22d0c..9dcec28 100644 --- a/ambari-web/app/styles/widgets.less +++ b/ambari-web/app/styles/widgets.less @@ -224,6 +224,10 @@ outline: 0 none; } } + + .icon-check-empty { + margin-left: -3px; + } } } http://git-wip-us.apache.org/repos/asf/ambari/blob/11950930/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js index 8e00238..968047a 100644 --- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js +++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js @@ -273,7 +273,13 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({ } this.set('slider', slider); // hide some ticks. can't do this via css - this.$('.slider-tick:first, .slider-tick:last').hide(); + if (defaultValueId == 0) { + this.$('.slider-tick:last').hide(); + } else if (defaultValueId == ticks.length - 1) { + this.$('.slider-tick:first').hide(); + } else { + this.$('.slider-tick:first, .slider-tick:last').hide(); + } }, /**
