summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-07-10 10:51:25 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-07-10 10:51:25 -0400
commit5f6b169c321722e51f1e0b7ac0eaea7d7e47e433 (patch)
treee1633fa74673566df283bef3f19ba035abb5c617 /www/js/DataModel.js
parent2559905b54b77668361d8a1325a46d5183e61aa5 (diff)
You can now rerrange and hide monitors in montage
Diffstat (limited to 'www/js/DataModel.js')
-rw-r--r--www/js/DataModel.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 4ebd9ed6..8b91847f 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -263,9 +263,18 @@ angular.module('zmApp.controllers').service('ZMDataModel', ['$http', '$q', '$ion
monitors = data.monitors;
console.log("promise resolved inside HTTP success");
monitorsLoaded = 1;
- d.resolve(monitors);
$ionicLoading.hide();
zmLog ("Monitor load was successful, loaded " + monitors.length + " monitors");
+
+ // FIXME: This really should not be here.
+ var i;
+
+ for ( i = 0; i< monitors.length; i++)
+ {
+ monitors[i].Monitor.listDisplay='show';
+ // monitors[i].Monitor.sortOrder=i;
+ }
+ d.resolve(monitors);
})
.error(function (err) {
console.log("HTTP Error " + err);