diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-05 15:41:44 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-05 15:41:44 -0500 |
| commit | 2ac2150dc0fa6733082babc6971383b35835971f (patch) | |
| tree | 72ce96bf46a4d84f986b0a66ccd97f591bf7ebf0 /www/templates | |
| parent | 2b51690e5a5dec4d1925ca3090ad75e00991443b (diff) | |
swipe fixes
Diffstat (limited to 'www/templates')
| -rw-r--r-- | www/templates/events-modal.html | 6 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 35 |
2 files changed, 28 insertions, 13 deletions
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 8c2ca549..3a3f36ff 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -3,7 +3,8 @@ <ion-modal-view cache-view="false"> <ion-content style="background-color:#444444" ng-cloak> - <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; " delegate-handle="imgscroll"> + <ion-scroll has-bouncing=false min-zoom=1 zooming="true" direction="xy" style="width: 100%; " delegate-handle="imgscroll" on-swipe-left="onSwipeEvent(nextId,1)" + on-swipe-right="onSwipeEvent(prevId,-1)"> <div id="full-screen-event" style="height: 100vh;"> @@ -16,8 +17,7 @@ image-spinner-src="{{playbackURL}}/index.php?view=image&rand={{$root.rand}}&path={{relativePath}}{{slide.img}}&scale={{loginData.singleImageQuality}}" image-spinner-loader="lines" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" - on-swipe-left="onSwipe(nextId,1)" - on-swipe-right="onSwipe(prevId,-1)" + /> </div> <div ng-if="animationInProgress"> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 47f67f08..e0779ed9 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -10,14 +10,29 @@ direction="xy" style="width: 100%; "> <!-- android needs this 100vh - otherwise max- does not work --> - <div style="height: 100vh;" class="main"> - <div ng-if="$root.authSession!='undefined'"> - <img id="monitorimage" imageonload="finishedLoadingImage()" - image-spinner-loader="lines" - image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitorId}}{{$root.authSession}}&rand={{$root.modalRand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" - on-swipe-left="onSwipeLeft(monitorId,1)" - on-swipe-right="onSwipeRight(monitorId,-1)" /> - <!-- on-swipe-left="onSwipeLeft(monitorId,-1)" on-swipe-right="onSwipeRight(monitorId,1)"--> + <div id="monitorimage" style="height: 100vh;" class="main"> + + + + <div ng-if="$root.authSession!='undefined'"> + + + <div ng-if="!animationInProgress"> + <img imageonload="finishedLoadingImage()" + image-spinner-loader="lines" + image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitorId}}{{$root.authSession}}&rand={{$root.modalRand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" + on-swipe-left="onSwipe(monitorId,1)" + on-swipe-right="onSwipe(monitorId,-1)" /> + + </div> + <div ng-if="animationInProgress"> + <img + + ng-src="img/pausevideo.png" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" + /> + </div> + + </div> <div ng-if="$root.authSession=='undefined'"> <img id="img-$index" ng-src="img/pausevideo.png" style="display:block;" @@ -52,9 +67,9 @@ </nav> <nav mfb-menu position="tr" effect="zoomin" label="collapse" active-icon="ion-chevron-up" resting-icon="ion-chevron-down" toggling-method="click"> - <button mfb-button icon="ion-android-arrow-back" label="previous monitor" ng-click="onTapLeft(monitorId,-1);"> + <button mfb-button icon="ion-android-arrow-back" label="previous monitor" ng-click="onTap(monitorId,-1);"> </button> - <button mfb-button icon="ion-android-arrow-forward" label="next monitor" ng-click="onTapRight(monitorId,1);"> + <button mfb-button icon="ion-android-arrow-forward" label="next monitor" ng-click="onTap(monitorId,1);"> </button> </nav> |