diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/external/build-extras.gradle | 3 | ||||
| -rwxr-xr-x | www/js/DataModel.js | 5 | ||||
| -rw-r--r-- | www/templates/montage.html | 9 |
3 files changed, 8 insertions, 9 deletions
diff --git a/www/external/build-extras.gradle b/www/external/build-extras.gradle new file mode 100644 index 00000000..70b55fb0 --- /dev/null +++ b/www/external/build-extras.gradle @@ -0,0 +1,3 @@ +configurations { + all*.exclude group: 'com.android.support', module: 'support-v13' +} 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"; diff --git a/www/templates/montage.html b/www/templates/montage.html index 4615e82e..8580d72a 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -84,19 +84,14 @@ <!-- <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng-if="monitor.Monitor.Function!='None' && monitor.Monitor.Enabled !='0' ">--> <span ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit"> - + <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}} "> - - - <div class="grid-item grid-item-{{monitor.Monitor.gridScale}} " data-item-id="{{monitor.Monitor.Id}}" data-item-size="{{monitor.Monitor.gridScale}}" data-item-listdisplay="{{monitor.Monitor.listDisplay}} " > - - - <figure class="{{dragBorder}}" ng-show="monitor.Monitor.listDisplay!='noshow'"> <!--<div ng-if="!isModalActive" >--> <!--<div ng-if="$root.authSession!='undefined' && !isBackground() && !areImagesLoading">--> <div ng-if="$root.authSession!='undefined' && !isBackground() "> <div ng-if = "!minimal" > + <img class="{{monitor.Monitor.selectStyle}}" id="img-{{$index}}" image-spinner-src="{{monitor.Monitor.streamingURL}}/nph-zms?mode={{getMode()}}&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{randToAvoidCacheMem}}" ng-click="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey,monitor):toggleSelectItem(monitor.Monitor.Id);" image-spinner-loader="lines" img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}" /> |