diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-03 11:37:07 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-11-03 11:37:07 -0400 |
| commit | 92ce72c21149d053ee3c85b600878540c77ee248 (patch) | |
| tree | 69bd96ae70c8bd2a1584eb4c31811edc94c6ec49 /www/js/DataModel.js | |
| parent | 47f0593fba08f361818a2200db6e75ec85be9799 (diff) | |
make sure monitor show/hide is enabled if packery positions doesn't exist. Also make sure its loaded in getMonitors
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |