From f24f26af05dc837da139e00396e1060e0871c668 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 31 Dec 2016 16:53:58 +0100 Subject: [PATCH 1/2] widget_iframe - new setting value-url to allow getting the url from a reading allowing fhem to steer the url) --- www/tablet/js/widget_iframe.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/tablet/js/widget_iframe.js b/www/tablet/js/widget_iframe.js index 3a606da4..5a411953 100755 --- a/www/tablet/js/widget_iframe.js +++ b/www/tablet/js/widget_iframe.js @@ -29,7 +29,9 @@ var Modul_iframe = function () { elem.initData('color-error', '#505050'); elem.initData('get', 'STATE'); elem.initData('check', true); - + // allow readings to contain the url for the iframe + elem.initData('value-url', elem.data('value-url') || false); + me.addReading(elem, 'get'); } @@ -92,6 +94,10 @@ var Modul_iframe = function () { var elem = $(this); var value = elem.getReading('get').val; if (value) { + if ( elem.data('value-url') ) { + elem.data('src', value); +// console.log('Got URL on update',value); + } if (value == elem.data('get-refresh')) me.init_ui(elem); else if (value.match(RegExp('^' + elem.data('get-refresh') + '$'))) From c3c7e8df420a9ad15fbddd0b5cebada1f8108381 Mon Sep 17 00:00:00 2001 From: Johannes Viegener Date: Mon, 2 Jan 2017 13:16:58 +0100 Subject: [PATCH 2/2] widget_select.js - FIX: set item also on update of alias list --- www/tablet/js/widget_select.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/tablet/js/widget_select.js b/www/tablet/js/widget_select.js index 909abb08..bae013e6 100755 --- a/www/tablet/js/widget_select.js +++ b/www/tablet/js/widget_select.js @@ -74,6 +74,7 @@ var Modul_select = function () { items = items.split(':'); elem.data('alias', items); fillList(elem); + setCurrentItem(elem); } }); @@ -116,4 +117,4 @@ var Modul_select = function () { }); return me; -}; \ No newline at end of file +};