diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-02-05 11:27:33 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-02-05 11:27:33 -0500 |
| commit | 1b842ce605b01308de8e9ee44c8a890a4c3c59f8 (patch) | |
| tree | 26f328f511f42812924f3b4be24d4bba5bfe2130 /www | |
| parent | 2dca00fc8be172f6bed7bbd8cc9b46093f978bea (diff) | |
#155 - make sure local images don't use the same DOM id so we don't lose the streaming object
Former-commit-id: 0428ebd5e97cbbfe2d3140cd8555e80d3bbd33b1
Diffstat (limited to 'www')
| -rw-r--r-- | www/templates/montage-history.html | 7 | ||||
| -rw-r--r-- | www/templates/montage.html | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html index 43ebd35a..90e0ad6c 100644 --- a/www/templates/montage-history.html +++ b/www/templates/montage-history.html @@ -49,7 +49,10 @@ <div ng-if="$root.authSession!='undefined' && !isBackground()"> <div ng-if = "!minimal && monitor.eventUrl == 'img/noevent.png' && !sliderVal.hideNoEvents"> - <img id="img-{{$index}}" image-spinner-src="{{isBackground()?'':monitor.eventUrl}}" image-spinner-loader="lines" style=" + + <!-- make sure we don't use id here + -- or we lose the handle for cleanup forever!--> + <img image-spinner-src="{{isBackground()?'':monitor.eventUrl}}" image-spinner-loader="lines" style=" width: 100% !important; height: auto !important;" /> <div style="position:absolute; bottom:0%; right:0%;white-space:nowrap;overflow:hidden;" @@ -98,7 +101,7 @@ </div> <!-- valid auth session &!background --> <div ng-if="!$root.authSession=='undefined' || isBackground()"> - <img id="img-{{$index}}" image-spinner-src="img/pausevideo.png" + <img image-spinner-src="img/pausevideo.png" style="width: 100% !important;height: auto !important;" /> </div> </div> diff --git a/www/templates/montage.html b/www/templates/montage.html index 51ad3d19..5c14fa88 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -61,13 +61,13 @@ <div ng-if="!isModalActive"> <div ng-if="$root.authSession!='undefined' && !isBackground()"> <div ng-if = "!minimal"> - <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey)" image-spinner-loader="lines" style=" + <img id="img-{{$index}}" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey)" image-spinner-loader="lines" style=" width: 100% !important; height: auto !important;" /> </div> <div ng-if = "minimal"> - <img id="img-$index" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey)" image-spinner-loader="lines" style="margin-top:0px; + <img id="{{img-$index}}" image-spinner-src="{{LoginData.streamingurl}}/nph-zms?mode=single&monitor={{monitor.Monitor.Id}}&scale={{LoginData.montageQuality}}{{$root.authSession}}&rand={{$root.rand}}" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey)" image-spinner-loader="lines" style="margin-top:0px; width: 100% !important; height: auto !important;" /> </div> @@ -76,7 +76,7 @@ </div> <div ng-if="!$root.authSession=='undefined' || isBackground()"> - <img id="img-$index" image-spinner-src="img/pausevideo.png" style="width: 100% !important; + <img image-spinner-src="img/pausevideo.png" style="width: 100% !important; height: auto !important;" /> </div> @@ -97,7 +97,7 @@ <div ng-if="isModalActive"> - <img id="img-$index" image-spinner-src="img/pausevideo.png" style="margin-top:0px; + <img image-spinner-src="img/pausevideo.png" style="margin-top:0px; width: 100% !important; height: auto !important;" /> </div> |