summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2016-12-07 16:47:34 -0500
committerPliable Pixels <pliablepixels@gmail.com>2016-12-07 16:47:34 -0500
commit84c63e7a435d5961a1fd3e2b9b0b65f70efeca83 (patch)
tree50e284acf6bd27be7cf4fcb211be7165e02fe593 /www/js/DataModel.js
parentae491ab2d29738a1da7f046e520cc2e61e9d4206 (diff)
changes to send monitor list #391. Still hacky - needs cleanup
Diffstat (limited to 'www/js/DataModel.js')
-rw-r--r--www/js/DataModel.js11
1 files changed, 11 insertions, 0 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 8786b56e..06d20e57 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -1380,6 +1380,17 @@ angular.module('zmApp.controllers')
// I've wrapped this function in my own promise even though http returns a promise.
//-----------------------------------------------------------------------------
+ //
+
+ // returns a non promise version
+ // so if monitors is null, it will return null
+ // As of now, this is only used by EventServer.js to
+ // send the right list of monitors after registration
+ // token
+ getMonitorsNow: function()
+ {
+ return monitors;
+ },
getMonitors: function(forceReload)
{