diff --git a/web/ia7/house/main.shtml b/web/ia7/house/main.shtml index 61164499a..d660f8f06 100644 --- a/web/ia7/house/main.shtml +++ b/web/ia7/house/main.shtml @@ -82,7 +82,7 @@

MisterHouse was created by Bruce Winter. Ron Klinkien developed the v2.3 web interface. Kevin Robert Keegan - designed the IA7 web prototype, updates by H.Plato. IA7 v1.5.550 Font Awesome by Dave Gandy - http://fontawesome.io

+ designed the IA7 web prototype, updates by H.Plato. IA7 v1.5.560 Font Awesome by Dave Gandy - http://fontawesome.io

diff --git a/web/ia7/include/javascript.js b/web/ia7/include/javascript.js index a9ddec6d6..5b214257e 100644 --- a/web/ia7/include/javascript.js +++ b/web/ia7/include/javascript.js @@ -1,4 +1,4 @@ -// v1.5.550 +// v1.5.560 var entity_store = {}; //global storage of entities var json_store = {}; @@ -2508,8 +2508,8 @@ var floorplan = function(group,time) { } else { sliderstate += "%"; } - if ($(".entity-name").text() == fp_entity) { - url= '/SET;none?select_item='+$(".entity-name").text()+'&select_state='+sliderstate; + if ($(".entity-name").length == 1) { + url= '/SET;none?select_item='+fp_entity+'&select_state='+sliderstate; $.get( url); fp_popover_close = true; last_slider_popover = fp_entity; @@ -2518,7 +2518,8 @@ var floorplan = function(group,time) { } }); $('.btn-state-cmd').on('click', function () { - var url= '/SET;none?select_item='+$(".entity-name").text()+'&select_state='+$(this).text(); + var fp_entity = $(this).parent().parent().parent().parent().attr("title");//.match(/entity_(.*)_\d+$/)[1]; + var url= '/SET;none?select_item='+fp_entity+'&select_state='+$(this).text(); if (!$(this).hasClass("disabled")) $.get( url); fp_popover_close = true; $('.popover').popover('hide');