Fixed staticpage with direct_control

hollie · Dec 11, 2016 · efea5a0 · efea5a0
1 parent 9912b03
commit efea5a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/web/ia7/house/main.shtml b/web/ia7/house/main.shtml
@@ -82,10 +82,10 @@
 	<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 v4 web prototype, updates by H.Plato. IA7 v1.3.600 Font Awesome by Dave Gandy - http://fontawesome.io</small></p>
+			designed the v4 web prototype, updates by H.Plato. IA7 v1.3.601 Font Awesome by Dave Gandy - http://fontawesome.io</small></p>
 		</div>
 	</div>
 </div>
 <script>
 	fixIA7Nav();
-</script>
+</script>
diff --git a/web/ia7/include/javascript.js b/web/ia7/include/javascript.js
@@ -1,4 +1,4 @@
-// v1.3.600
+// v1.3.601
 
 var entity_store = {}; //global storage of entities
 var json_store = {};
@@ -972,7 +972,9 @@ var updateStaticPage = function(link,time) {
 						$('button[entity="'+entity+'"]').removeClass("btn-danger");
 						$('button[entity="'+entity+'"]').removeClass("btn-info");
 						$('button[entity="'+entity+'"]').addClass("btn-"+color);
-						if (json_store.ia7_config.objects[entity].direct_control !== undefined && json_store.ia7_config.objects[entity].direct_control == "yes") $('button[entity="'+entity+'"]').addClass("btn-direct");
+						if (json_store.ia7_config.objects[entity] !== undefined && 
+						    json_store.ia7_config.objects[entity].direct_control !== undefined && 
+						    json_store.ia7_config.objects[entity].direct_control == "yes") $('button[entity="'+entity+'"]').addClass("btn-direct");
 
 						//don't run this if stategrp0 exists	
 						if (states_loaded == 0) {
@@ -3016,4 +3018,4 @@ $(document).ready(function() {
 // 
 // You should have received a copy of the GNU General Public License along with this program;
 //   if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-//
+//