diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-08 12:14:32 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-10-08 12:14:32 -0400 |
| commit | bace2be553e3175ba7a47024c8352e43d285b620 (patch) | |
| tree | 8cae03c058a6500ab225f65e5a2842e4db7bde07 /www/js/DataModel.js | |
| parent | 881a3b160a1320f2318712c1063e40775236099f (diff) | |
log cleanup, wait for eventserver init before sending messages
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 05a77294..a87f7765 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1142,13 +1142,13 @@ angular.module('zmApp.controllers') } - console.log("INIT SIMUL=" + loginData.disableSimulStreaming); - console.log("INIT PLATFORM IS=" + $rootScope.platformOS); + //console.log("INIT SIMUL=" + loginData.disableSimulStreaming); + //console.log("INIT PLATFORM IS=" + $rootScope.platformOS); if (typeof loginData.disableSimulStreaming == 'undefined') { loginData.disableSimulStreaming = ($rootScope.platformOS == 'ios') ? true : false; - console.log("INIT DISABLING SIMUL:" + loginData.disableSimulStreaming); + //console.log("INIT DISABLING SIMUL:" + loginData.disableSimulStreaming); } @@ -1870,12 +1870,16 @@ angular.module('zmApp.controllers') //-------------------------------------------------------------------------- getPathZms: function () { var d = $q.defer(); + + var apiurl = loginData.apiurl; var myurl = apiurl + '/configs/viewByName/ZM_PATH_ZMS.json'; debug("Config URL for ZMS PATH is:" + myurl); $http.get(myurl) .then(function (data) { + data = data.data; + //console.log (">>>> GOT: "+JSON.stringify(data)); configParams.ZM_PATH_ZMS = data.config.Value; d.resolve(configParams.ZM_PATH_ZMS); return (d.promise); |