Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IA7 v1.5.560 - fixed floorplan items with labels #712

Merged
merged 1 commit into from
Jul 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/ia7/house/main.shtml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<div class='col-sm-12 col-sm-offset-0 col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2'>
<div class='col-sm-12'>
<p class="text-muted"><small> 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</small></p>
designed the IA7 web prototype, updates by H.Plato. IA7 v1.5.560 Font Awesome by Dave Gandy - http://fontawesome.io</small></p>
</div>
</div>
</div>
Expand Down
9 changes: 5 additions & 4 deletions web/ia7/include/javascript.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// v1.5.550
// v1.5.560

var entity_store = {}; //global storage of entities
var json_store = {};
Expand Down Expand Up @@ -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;
Expand All @@ -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');
Expand Down