From 92ce72c21149d053ee3c85b600878540c77ee248 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 3 Nov 2016 11:37:07 -0400 Subject: make sure monitor show/hide is enabled if packery positions doesn't exist. Also make sure its loaded in getMonitors --- www/js/DataModel.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'www/js') diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 8671ab53..3fd1f920 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1276,7 +1276,8 @@ angular.module('zmApp.controllers') for (var i = 0; i < monitors.length; i++) { - //monitors[i].Monitor.listDisplay = 'show'; + // make them all show for now + monitors[i].Monitor.listDisplay = 'show'; monitors[i].Monitor.isAlarmed = false; monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); @@ -1357,6 +1358,8 @@ angular.module('zmApp.controllers') debug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access"); } } + // now get packery hide if applicable + reloadMonitorDisplayStatus(); d.resolve(monitors); }) .error(function (err) { -- cgit v1.2.3