From 2d53e6e18034ef94feb410afa9ceb82caf1e4b39 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 7 Aug 2019 15:39:14 +0530 Subject: [PATCH 1/2] ui: fix for custom offering param range check Signed-off-by: Abhishek Kumar --- ui/scripts/ui-custom/instanceWizard.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js index 5ce18702b684..1142e83f68f7 100644 --- a/ui/scripts/ui-custom/instanceWizard.js +++ b/ui/scripts/ui-custom/instanceWizard.js @@ -636,8 +636,9 @@ $step.find('.custom-slider-container').show(); var setupSlider = function(sliderClassName, minVal, maxVal) { $step.find('.custom-slider-container .' + sliderClassName + ' .size.min span').html(minVal); - $step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(minVal); $step.find('.custom-slider-container .' + sliderClassName + ' .size.max span').html(maxVal); + $step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(minVal); + $step.find('.custom-slider-container .' + sliderClassName + ' span.ui-slider-handle').css('left', '0%'); $step.find('.custom-slider-container .' + sliderClassName + ' .slider').each(function() { var $slider = $(this); $slider.slider({ @@ -651,19 +652,20 @@ }); $step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').bind('change', function() { - var val = $step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(); + var val = parseInt($(this).val(), 10); if (val < minVal || val > maxVal) { cloudStack.dialog.notice({ message: $.validator.format(_l('message.validate.range'), [minVal, maxVal]) }); } if (val < minVal) { val = minVal; - $step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(val); + $(this).val(val); } if(val > maxVal) { val = maxVal; - $step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(val); + $(this).val(val); } $step.find('span.custom-slider-container .' + sliderClassName).html(_s(val)); + $step.find('.custom-slider-container .' + sliderClassName + ' span.ui-slider-handle').css('left', (((val-minVal)/(maxVal-minVal))*100)+'%'); }); } setupSlider('slider-cpu-cores', minCpuNumber, maxCpuNumber); From 23d4a90d76b055734dc2277da8057457c16aa06f Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Wed, 7 Aug 2019 17:41:47 +0530 Subject: [PATCH 2/2] ui: fix for slider position restore Signed-off-by: Abhishek Kumar --- ui/scripts/ui-custom/instanceWizard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js index 1142e83f68f7..b240c37f499a 100644 --- a/ui/scripts/ui-custom/instanceWizard.js +++ b/ui/scripts/ui-custom/instanceWizard.js @@ -638,7 +638,6 @@ $step.find('.custom-slider-container .' + sliderClassName + ' .size.min span').html(minVal); $step.find('.custom-slider-container .' + sliderClassName + ' .size.max span').html(maxVal); $step.find('.custom-slider-container .' + sliderClassName + ' input[type=text]').val(minVal); - $step.find('.custom-slider-container .' + sliderClassName + ' span.ui-slider-handle').css('left', '0%'); $step.find('.custom-slider-container .' + sliderClassName + ' .slider').each(function() { var $slider = $(this); $slider.slider({ @@ -667,6 +666,7 @@ $step.find('span.custom-slider-container .' + sliderClassName).html(_s(val)); $step.find('.custom-slider-container .' + sliderClassName + ' span.ui-slider-handle').css('left', (((val-minVal)/(maxVal-minVal))*100)+'%'); }); + $step.find('.custom-slider-container .' + sliderClassName + ' span.ui-slider-handle').css('left', '0%'); } setupSlider('slider-cpu-cores', minCpuNumber, maxCpuNumber); setupSlider('slider-memory-mb', minMemory, maxMemory);