FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-13 23:36:37 +00:00
Code Issues Releases Wiki Activity

fhemweb.js: more slider fixing (Forum #44104)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9916 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-11-17 09:25:15 +00:00
parent 2ed2b970d0
commit 703cf44114
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/www/pgm2/fhemweb.js
View File

@ -765,7 +765,7 @@ FW_createSlider(elName, devName, vArr, currVal, set, params, cmd)
var min = parseFloat(vArr[1]); var min = parseFloat(vArr[1]);
var stp = parseFloat(vArr[2]); var stp = parseFloat(vArr[2]);
var max = parseFloat(vArr[3]); var max = parseFloat(vArr[3]);
var flt = vArr[4]; var flt = (vArr.length == 5 && vArr[4] == "1");
var dp = 0; // decimal points for float var dp = 0; // decimal points for float
if(flt) { if(flt) {
var s = ""+stp; var s = ""+stp;
@ -797,10 +797,11 @@ FW_createSlider(elName, devName, vArr, currVal, set, params, cmd)
return; return;
maxX = slider.offsetWidth-sh.offsetWidth; maxX = slider.offsetWidth-sh.offsetWidth;
offX = (currVal-min)*maxX/(max-min); offX = (currVal-min)*maxX/(max-min);
sh.innerHTML = currVal; var strVal = (flt ? currVal.toFixed(dp) : ""+parseInt(currVal));
sh.innerHTML = strVal
sh.setAttribute('style', 'left:'+offX+'px;'); sh.setAttribute('style', 'left:'+offX+'px;');
if(elName) if(elName)
slider.nextSibling.setAttribute('value', currVal); slider.nextSibling.setAttribute('value', strVal);
} }
$(newEl).keydown(function(e){ $(newEl).keydown(function(e){
@ -809,12 +810,13 @@ FW_createSlider(elName, devName, vArr, currVal, set, params, cmd)
if(currVal < min) currVal = min; if(currVal < min) currVal = min;
if(currVal > max) currVal = max; if(currVal > max) currVal = max;
offX = (currVal-min)*maxX/(max-min); offX = (currVal-min)*maxX/(max-min);
sh.innerHTML = currVal; var strVal = (flt ? currVal.toFixed(dp) : ""+parseInt(currVal));
sh.innerHTML = strVal;
sh.setAttribute('style', 'left:'+offX+'px;'); sh.setAttribute('style', 'left:'+offX+'px;');
if(cmd) if(cmd)
cmd(currVal); cmd(strVal);
if(elName) if(elName)
slider.nextSibling.setAttribute('value', currVal); slider.nextSibling.setAttribute('value', strVal);
}); });
function function
@ -877,8 +879,6 @@ FW_createSlider(elName, devName, vArr, currVal, set, params, cmd)
currVal = (res ? parseFloat(res[0]) : min); currVal = (res ? parseFloat(res[0]) : min);
if(currVal < min || currVal > max) if(currVal < min || currVal > max)
currVal = min; currVal = min;
if(flt)
currVal = parseFloat(currVal).toFixed(dp);
newEl.activateFn(); newEl.activateFn();
}; };
return newEl; return newEl;