summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js/DataModel.js')
-rwxr-xr-xwww/js/DataModel.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 7f297f5f..f18b38ed 100755
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -1121,7 +1121,7 @@ angular.module('zmApp.controllers')
// FIXME: HACK: This is the latest entry point into dataModel init, so start portal login after this
// not the neatest way
- $rootScope.$emit('init-complete');
+ $rootScope.$broadcast('init-complete');
});
monitorsLoaded = 0;
@@ -1392,7 +1392,7 @@ angular.module('zmApp.controllers')
// Skipping monitor number as I only need an auth key
// so no need to generate an image
- var myurl = loginData.url + "/index.php?view=watch&mid=" + mid + "&connkey=" + ck;
+ var myurl = loginData.url + "/index.php?view=watch&mid=" + mid
debug("DataModel: Getting auth from " + myurl + " with mid=" + mid);
$http.get(myurl)
.then(function (success) {
@@ -2015,7 +2015,7 @@ angular.module('zmApp.controllers')
isTzSupported = true;
else
isTzSupported = false;
- $rootScope.$emit('tz-updated');
+ $rootScope.$broadcast('tz-updated');
return (d.promise);
},