diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-03-10 21:31:03 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-03-10 21:31:03 -0500 |
| commit | 3e902602c18b8f5b3032e4435a31d569c5ff6696 (patch) | |
| tree | 21140a7abc5baee9ef623649ee5038f7f7e3095e | |
| parent | 69cafd1d7de79f9357fa7ef1b8241e549c0737ef (diff) | |
allowed for scrolling when montage icons fill screen
Former-commit-id: 7fe60d9a945072899c921cd463f57270e9dafd58
| -rw-r--r-- | www/js/MontageCtrl.js | 14 | ||||
| -rw-r--r-- | www/templates/montage.html | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index ca9d3dd6..9d0fe352 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -311,6 +311,20 @@ function initPackery() } + $scope.swipeUp = function() + { + console.log ("SWIPE UP"); + $ionicScrollDelegate.$getByHandle("montage-delegate").scrollBy(0, $rootScope.devHeight/2, true); + }; + + $scope.swipeDown = function() + { + console.log ("SWIPE DOWN"); + $ionicScrollDelegate.$getByHandle("montage-delegate").scrollBy(0, -($rootScope.devHeight/2), true); + }; + + + $scope.closeReorderModal = function () { diff --git a/www/templates/montage.html b/www/templates/montage.html index efb853e8..9d2837a5 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -21,7 +21,7 @@ </ion-nav-buttons> - <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" > + <ion-content ng-cloak has-bouncing="false" style="background-color:#444444" delegate-handle="montage-delegate" > <!--<ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"> </ion-refresher>--> @@ -47,7 +47,7 @@ <div ng-if="$root.authSession!='undefined' && !isBackground()"> <div ng-if = "!minimal"> <div> - <img class="{{monitor.Monitor.selectStyle}}" 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="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines" /> + <img class="{{monitor.Monitor.selectStyle}}" 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="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines" on-swipe-up="swipeUp()" on-swipe-down="swipeDown()" /> <!-- <div style="position:absolute;top:40%; left:50%;opacity:0.5;"><button ng-class="monitor.Monitor.listDisplay=='show'?'button button-positive button-small icon ion-ios-eye':'button button-assertive button-small icon ion-eye-disabled'" ng-click="toggleHide(monitor)" ng-if="isDragabillyOn"></button></div>--> </div> @@ -56,7 +56,7 @@ </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="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines" /> + <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="!isDragabillyOn?openModal(monitor.Monitor.Id, monitor.Monitor.Controllable, monitor.Monitor.ControlId, monitor.Monitor.connKey):toggleSelectItem($index);" image-spinner-loader="lines" swipe-up="swipeUp()" on-swipe-down="swipeDown()" /> </div> </div> |