From eda0e54904977a4b6df895a85abea51e80887e83 Mon Sep 17 00:00:00 2001
From: Matscher <>
Date: Thu, 12 Jan 2017 18:28:18 +0000
Subject: [PATCH] DateTimePicker/fhemweb_datetime.js: added set parameter to
datetime widget ID, to differentiate more widgets for one element
git-svn-id: https://svn.fhem.de/fhem/trunk@13048 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/CHANGED | 2 ++
.../contrib/Widgets/DateTimePicker/fhemweb_datetime.js | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/fhem/CHANGED b/fhem/CHANGED
index c61c1d439..b8c613f0d 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
+ - bugfix: contrib/Widgets/DateTimePicker/fhemweb_datetime.js:
+ - added set parameter to ID to differentiate datetime widgets
- new : 74_XiaomiFlowerSens, to retrieves data from a Xiaomi Flower Monitor
- update: 73_NUKIBridge, 74_NUKIDevice
set Commands are filtered by Attributs,better check alive function
diff --git a/fhem/contrib/Widgets/DateTimePicker/fhemweb_datetime.js b/fhem/contrib/Widgets/DateTimePicker/fhemweb_datetime.js
index 802040d0c..151cabaf3 100644
--- a/fhem/contrib/Widgets/DateTimePicker/fhemweb_datetime.js
+++ b/fhem/contrib/Widgets/DateTimePicker/fhemweb_datetime.js
@@ -7,9 +7,11 @@ FW_datetimeCreate(elName, devName, vArr, currVal, set, params, cmd)
{
if(!vArr.length || vArr[0] != "datetime" || (params && params.length))
return undefined;
-
+
+ var widgetId = "datetimepicker-"+devName+"-"+set;
+
var newEl = $("<div style='display:inline-block'>").get(0);
- $(newEl).append('<input type="text" id="datetimepicker'+devName+'" onfocus="blur();" >');
+ $(newEl).append('<input type="text" id="'+widgetId+'" onfocus="blur();" >');
var inp = $(newEl).find("input");
if(elName)
$(inp).attr("name", elName);
@@ -39,7 +41,7 @@ FW_datetimeCreate(elName, devName, vArr, currVal, set, params, cmd)
format:"d.m.Y H:i",
onClose: function(current_time,$input){
console.log("set data");
- $('#datetimepicker'+devName).blur();
+ $("#"+widgetId).blur();
;}
};
@@ -99,7 +101,7 @@ FW_datetimeCreate(elName, devName, vArr, currVal, set, params, cmd)
loadScript("pgm2/jquery.datetimepicker.js");
$(newEl).click(function(){
- $('#datetimepicker'+devName).datetimepicker(options);
+ $("#"+widgetId).datetimepicker(options);
});
}