From 89afaee5e96f6fcab811713ecd52e96c4c6a4362 Mon Sep 17 00:00:00 2001 From: jp112sdl Date: Sat, 7 Mar 2020 23:04:15 +0100 Subject: [PATCH] minor fix in slider control for servo --- .../www/webui/js/extern/sliderControl.js | 2 +- src/addon/patch/common/sliderControl.js.patch | 2 +- .../revoke/common/0016-sliderControl.js.patch | 22 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/addon/patch/revoke/common/0016-sliderControl.js.patch diff --git a/patchsource/www/webui/js/extern/sliderControl.js b/patchsource/www/webui/js/extern/sliderControl.js index a12e9a4c..6bd4fbf1 100755 --- a/patchsource/www/webui/js/extern/sliderControl.js +++ b/patchsource/www/webui/js/extern/sliderControl.js @@ -45,8 +45,8 @@ sliderControl = function(type,id, val, iViewOnly, bSliderPosFlag,min, max, facto this.n_pathLeft = 1; this.n_pathTop = 1; this.n_pathLength = 190; + this.s_imgControlGreen = (type == "Servo") ?'/ise/img/slider/servoslider_grey.png':'/ise/img/slider/slider_yellow.png'; this.s_imgControlGray = (type == "Servo") ?'/ise/img/slider/servoslider_grey.png':'/ise/img/slider/slider_grey.png'; - this.s_imgControlGray = (type == "Servo") ?'/ise/img/slider/servoslider_grey.png':'/ise/img/slider/slider_yellow.png'; this.s_imgSlider = '/ise/img/slider/slider.gif'; // register in the global collection diff --git a/src/addon/patch/common/sliderControl.js.patch b/src/addon/patch/common/sliderControl.js.patch index df9bcfbe..4a31110b 100644 --- a/src/addon/patch/common/sliderControl.js.patch +++ b/src/addon/patch/common/sliderControl.js.patch @@ -15,8 +15,8 @@ this.n_pathLength = 190; - this.s_imgControlGray = '/ise/img/slider/slider_grey.png'; - this.s_imgControlGreen = '/ise/img/slider/slider_yellow.png'; ++ this.s_imgControlGreen = (type == "Servo") ?'/ise/img/slider/servoslider_grey.png':'/ise/img/slider/slider_yellow.png'; + this.s_imgControlGray = (type == "Servo") ?'/ise/img/slider/servoslider_grey.png':'/ise/img/slider/slider_grey.png'; -+ this.s_imgControlGray = (type == "Servo") ?'/ise/img/slider/servoslider_grey.png':'/ise/img/slider/slider_yellow.png'; this.s_imgSlider = '/ise/img/slider/slider.gif'; // register in the global collection diff --git a/src/addon/patch/revoke/common/0016-sliderControl.js.patch b/src/addon/patch/revoke/common/0016-sliderControl.js.patch new file mode 100644 index 00000000..df9bcfbe --- /dev/null +++ b/src/addon/patch/revoke/common/0016-sliderControl.js.patch @@ -0,0 +1,22 @@ +--- ./patchsource/www/webui/js/extern/sliderControl.js.orig ++++ ./patchsource/www/webui/js/extern/sliderControl.js +@@ -29,7 +29,7 @@ + if (factor) {this.factor = 100/(max-min);} else {this.factor = 1} + + this.n_minValue = 0; +- this.n_maxValue = 100; ++ this.n_maxValue = (type == "Servo") ? 180 : 100; + + this.n_step = 0; + this.s_form = null; +@@ -45,8 +45,8 @@ + this.n_pathLeft = 1; + this.n_pathTop = 1; + this.n_pathLength = 190; +- this.s_imgControlGray = '/ise/img/slider/slider_grey.png'; +- this.s_imgControlGreen = '/ise/img/slider/slider_yellow.png'; ++ this.s_imgControlGray = (type == "Servo") ?'/ise/img/slider/servoslider_grey.png':'/ise/img/slider/slider_grey.png'; ++ this.s_imgControlGray = (type == "Servo") ?'/ise/img/slider/servoslider_grey.png':'/ise/img/slider/slider_yellow.png'; + this.s_imgSlider = '/ise/img/slider/slider.gif'; + + // register in the global collection