diff options
| author | ARC <arjunrc@gmail.com> | 2015-04-29 21:54:40 -0400 |
|---|---|---|
| committer | ARC <arjunrc@gmail.com> | 2015-04-29 21:54:40 -0400 |
| commit | bcdc2629d7b289c48776169c350d8da3b74f64d4 (patch) | |
| tree | 2d6c08536a6bd25e302a7021172bfe964ecb0903 /www/templates | |
| parent | eabc4988d8627690a0a1111a9a163cbe03692bca (diff) | |
I think I've solved the blank screen issue. I've created an app directive that is triggered on imageonload - that hides an ionic loading. When I first show the modal, I display a "please wait". Timeout of 15 second it goes away. Need to test more, but I think this mostly works
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 3 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 4ff8bc8c..8f43b114 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -14,8 +14,9 @@ <!-- replay can also be gapless --> <div ng-if="!isSimulated()"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> - <img ng-src="{{loginData.url}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" /> + <img imageonload="finishedLoadingImage()" ng-src="{{loginData.url}}/cgi-bin/zms?source=event&mode=jpeg&event={{eventId}}&frame=1&maxfps=5&replay=single&user={{loginData.username}}&pass={{loginData.password}}&connkey={{connKey}}&rand={{rand}}" width="100%" /> </ion-scroll> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 5d559605..1d5e5488 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -16,7 +16,7 @@ <div ng-if="!isSimulated()"> <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; "> - <img ng-src="{{LoginData.url}}/cgi-bin/zms?mode=jpeg&monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" style="background-image:url('http://www.pbase.com/arjunrc/image/159892445/medium.jpg');" /> + <img imageonload="finishedLoadingImage()" ng-src="{{LoginData.url}}/cgi-bin/zms?mode=jpeg&monitor={{monitorId}}&maxfps=3&buffer=1000&user={{LoginData.username}}&pass={{LoginData.password}}&rand={{rand}}" width="100%" style="background-image:url('http://www.pbase.com/arjunrc/image/159892445/medium.jpg');" /> </ion-scroll> </div> |