diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-03-14 14:24:20 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-03-14 14:24:20 -0400 |
| commit | 9003360ad7321d68c944230aee632687d4e3edbb (patch) | |
| tree | 54d9adb38b110b82e6a8e64888c7cbf890eab89f /www/js | |
| parent | e30052fc3e1607af2e6161e87032a66a89c83ca5 (diff) | |
updates for yet another build process break thanks to new google libraries. WTF.
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/DataModel.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 8aa3e6ea..d553f0dd 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1544,7 +1544,7 @@ angular.module('zmApp.controllers') } if (serverFound) { - // debug("Monitor " + monitors[i].Monitor.Id + " has a recording server hostname of " + multiservers[j].Server.Hostname); + debug("Monitor " + monitors[i].Monitor.Id + " has a recording server hostname of " + multiservers[j].Server.Hostname); // Now here is the logic, I need to retrieve serverhostname, // and slap on the host protocol and path. Meh. @@ -1607,7 +1607,7 @@ angular.module('zmApp.controllers') monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion, "1.30") == -1) ? "path" : "fid"; // debug("API " + $rootScope.apiVersion + ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access"); - //debug ("Streaming URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.streamingURL ); + debug ("Streaming URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.streamingURL ); //debug ("Base URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.baseURL ); } else { @@ -1633,6 +1633,7 @@ angular.module('zmApp.controllers') } monitors[i].Monitor.streamingURL = st2; + debug ("Streaming URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.streamingURL ); //console.log ("NO SERVER MATCH CONSTRUCTED STREAMING PATH="+st2); monitors[i].Monitor.baseURL = loginData.url; monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion, "1.30") == -1) ? "path" : "fid"; |