From be4ff3bee6ee5a326c5106f17422fcbc588c8a0a Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Wed, 18 Feb 2015 16:20:29 +0000
Subject: [PATCH] fhemweb.js: replaceLink (Forum #33766), first number for the
 slider (Forum #33861)

git-svn-id: https://svn.fhem.de/fhem/trunk@8029 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/www/pgm2/fhemweb.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js
index f8de6c0ad..2d45eb049 100644
--- a/fhem/www/pgm2/fhemweb.js
+++ b/fhem/www/pgm2/fhemweb.js
@@ -239,7 +239,7 @@ FW_okDialog(txt, parent)
   });
 
   FW_replaceWidgets(div);
-  FW_replaceLink(div); // Forum #33766
+  $(div).find("a[href]").each(function(){FW_replaceLink(this);}); //Forum #33766
 
   if(parent)
     $(div).dialog( "option", "position", {
@@ -765,8 +765,8 @@ FW_createSlider(elName, devName, vArr, currVal, set, params, cmd)
   sh.ontouchstart = function(e) { touchFn(e, mouseDown); }
 
   newEl.setValueFn = function(arg) {
-    arg = arg.replace(/[^\d.\-]/g, ""); // remove non numbers
-    currVal = (arg == "" ? min : parseFloat(arg));
+    var res = arg.match(/[\d.\-]+/); // extract first number
+    currVal = (res ? parseFloat(res[0]) : min);
     if(currVal < min || currVal > max)
       currVal = min;
     newEl.activateFn();