diff options
| -rw-r--r-- | www/js/DataModel.js | 10 | ||||
| -rw-r--r-- | www/js/ModalCtrl.js | 33 | ||||
| -rw-r--r-- | www/templates/devoptions.html | 5 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 8 |
4 files changed, 51 insertions, 5 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 51b2c9a3..400cebfa 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -39,6 +39,7 @@ angular.module('zmApp.controllers').service('ZMDataModel', 'enableDebug':false, // if enabled with log messages with "debug" 'usePin':false, 'pinCode':'', + 'canSwipeMonitors':true }; var configParams = { 'ZM_EVENT_IMAGE_DIGITS':'-1', @@ -153,6 +154,8 @@ angular.module('zmApp.controllers').service('ZMDataModel', + + if (window.localStorage.getItem("username") != undefined) { loginData.username = @@ -236,6 +239,12 @@ angular.module('zmApp.controllers').service('ZMDataModel', } + if (window.localStorage.getItem("canSwipeMonitors") != undefined) { + var canSwipeValue = window.localStorage.getItem("canSwipeMonitors"); + loginData.canSwipeMonitors = (canSwipeValue == "1") ? true:false; + } + + if (window.localStorage.getItem("usePin") != undefined) { var pinValue = window.localStorage.getItem("usePin"); loginData.usePin = (pinValue == "1") ? true:false; @@ -348,6 +357,7 @@ angular.module('zmApp.controllers').service('ZMDataModel', window.localStorage.setItem("eventServer", loginData.eventServer); window.localStorage.setItem("useSSL", loginData.useSSL?"1":"0"); window.localStorage.setItem("usePin", loginData.usePin?"1":"0"); + window.localStorage.setItem("canSwipeMonitors", loginData.canSwipeMonitors?"1":"0"); window.localStorage.setItem("pinCode", loginData.pinCode); diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index c1ce47a9..9cba8697 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -303,8 +303,24 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco }; - // not being used anymore - using a dedicated menu instead + $scope.onTapLeft = function (m,d) + { + ZMDataModel.zmDebug("ModalCtrl:Left tap detected, moving to " + ZMDataModel.getNextMonitor(m, d)); + $scope.monitorId = ZMDataModel.getNextMonitor(m, d); + + + $ionicLoading.hide(); + $ionicLoading.show({ + template: "please wait...", + noBackdrop: true, + duration: zm.loadingTimeout, + }); + }; + $scope.onSwipeLeft = function (m, d) { + var ld = ZMDataModel.getLogin(); + if (!ld.canSwipeMonitors) return; + ZMDataModel.zmDebug("ModalCtrl:Left swipe detected, moving to " + ZMDataModel.getNextMonitor(m, d)); $scope.monitorId = ZMDataModel.getNextMonitor(m, d); @@ -315,11 +331,24 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco noBackdrop: true, duration: zm.loadingTimeout, }); + + }; - // not being used anymore - using a dedicated menu instead + $scope.onTapRight = function (m,d) + { + ZMDataModel.zmDebug("ModalCtrl:Right tap detected, moving to " + ZMDataModel.getNextMonitor(m, d)); + $scope.monitorId = ZMDataModel.getNextMonitor(m, d); + + $ionicLoading.show({ + template: "please wait...", + noBackdrop: true, + duration: zm.loadingTimeout, + }); + }; $scope.onSwipeRight = function (m, d) { + if (!ld.canSwipeMonitors) return; ZMDataModel.zmDebug("ModalCtrl:Right swipe detected, moving to " + ZMDataModel.getNextMonitor(m, d)); $scope.monitorId = ZMDataModel.getNextMonitor(m, d); diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index ba25ab24..60d0b3ba 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -46,6 +46,11 @@ ng-checked="{{loginData.enableDebug}}" toggle-class="toggle-calm">Enable Debug Logs</ion-toggle> </label> + + <ion-toggle ng-model="loginData.canSwipeMonitors" + ng-checked="{{loginData.canSwipeMonitors}}" + toggle-class="toggle-calm">Swipe to change monitors</ion-toggle> + </label> <button class="button button-block button-balanced icon ion-locked" ng-click="saveDevOptions()"> Save diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 50d9c2cc..ecc37e77 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -14,7 +14,9 @@ <div ng-if="$root.authSession!='undefined'"> <img imageonload="finishedLoadingImage()" image-spinner-loader="lines" - image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}{{$root.authSession}}&rand={{$root.modalRand}}" ng-class="{'zm-image-fit':imageFit==true, 'zm-image-crop':imageFit==false}" /> + image-spinner-src="{{LoginData.streamingurl}}/cgi-bin/nph-zms?mode=single&monitor={{monitorId}}&maxfps={{LoginData.maxFPS}}{{$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> <div ng-if="$root.authSession=='undefined'"> @@ -50,9 +52,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="onSwipeLeft(monitorId,-1);"> + <button mfb-button icon="ion-android-arrow-back" label="previous monitor" ng-click="onTapLeft(monitorId,-1);"> </button> - <button mfb-button icon="ion-android-arrow-forward" label="next monitor" ng-click="onSwipeRight(monitorId,1);"> + <button mfb-button icon="ion-android-arrow-forward" label="next monitor" ng-click="onTapRight(monitorId,1);"> </button> </nav> |