diff options
| author | PliablePixels <pliablepixels@gmail.com> | 2015-08-07 10:39:14 -0400 |
|---|---|---|
| committer | PliablePixels <pliablepixels@gmail.com> | 2015-08-07 10:39:14 -0400 |
| commit | b5ffd6a53da56bdb883d7b3aa3b9f97e649ff324 (patch) | |
| tree | 57cf6ad5782fd9d8089c81d00768cc56c64519b8 /www/templates | |
| parent | 9f8f4a49cf908064b0303f09fde0556aee83142b (diff) | |
Removed force page reloads - now when you exit/resume the page should not flash
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 4 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 4 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index b66a0655..d98138d0 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -1,6 +1,6 @@ <div ng-controller="ModalCtrl"> <!-- style="width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"--> - <ion-modal-view cache="false" > + <ion-modal-view cache-view="false" > <ion-content style="background-color:#444444" ng-cloak> <ion-scroll has-bouncing=false min-zoom=1 zooming="true" @@ -15,7 +15,7 @@ <li ng-repeat="slide in slides"> <img imageonload="finishedLoadingImage($index)" - image-spinner-src="{{loginData.url}}/index.php?view=image&path={{relativePath}}{{slide.img}}" + image-spinner-src="{{loginData.url}}/index.php?view=image&&rand={{$root.rand}}&path={{relativePath}}{{slide.img}}" image-spinner-loader="lines" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}"/> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 4e85234d..18556b10 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -3,7 +3,7 @@ <!--style="background-color:#444444;width: 90%; height: 90%; top: 5%; left: 5%; right: 5%; bottom: 5%;"--> - <ion-modal-view cache="false" style="background-color:#444444" > + <ion-modal-view cache-view="false" style="background-color:#444444" > <ion-content > <ion-scroll has-bouncing=false min-zoom=1 zooming="true" @@ -13,7 +13,7 @@ <div style="height: 100vh;"> <img imageonload="finishedLoadingImage()" image-spinner-loader="lines" - image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" /> + image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=jpeg&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)" /> </div> </ion-scroll> </ion-content> diff --git a/www/templates/montage.html b/www/templates/montage.html index 035debd4..259f6587 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -43,7 +43,7 @@ <article class="main"> <!-- back to ng-src. spinner was not updating when rand changes--> <!-- FIXME: Scale is 50% hardcoded --> - <img image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{randomval}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" + <img image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/zms?mode=single&monitor={{monitor.Monitor.Id}}&maxfps={{LoginData.maxFPS}}&scale=50&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{$root.rand}}" width="{{((devWidth)/(7-monitorSize[$index]))}}px;" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId)" on-hold="onHold($index)" on-release="onRelease($index)" |