diff options
| author | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-20 10:32:42 -0500 |
|---|---|---|
| committer | Arjun Roychowdhury <pliablepixels@gmail.com> | 2015-11-20 10:32:42 -0500 |
| commit | 8cc0496efc897a7fc9b03be30839b4dc6f25c071 (patch) | |
| tree | 4c3ed4598c75bbb485a62793519404f035a8e5c8 | |
| parent | fcbe79419c77116f1fbd539f4ce8c16ffecfe437 (diff) | |
#90 - toggle label beween 'fill screen' and 'fit screen' so its easier to understand. Also switched default to fit
Former-commit-id: c16f04a43f8be2cb2c20e377cb6a3ea2f6fb511f
| -rw-r--r-- | www/js/ModalCtrl.js | 2 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 2 | ||||
| -rw-r--r-- | www/templates/monitors-modal.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/www/js/ModalCtrl.js b/www/js/ModalCtrl.js index b57e390e..7679d691 100644 --- a/www/js/ModalCtrl.js +++ b/www/js/ModalCtrl.js @@ -27,7 +27,7 @@ angular.module('zmApp.controllers').controller('ModalCtrl', ['$scope', '$rootSco }); $scope.animationInProgress = false; - $scope.imageFit = false; + $scope.imageFit = true; // FIXME: This is a hack - for some reason // the custom slider view is messed up till the image loads // in modal view diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 6efb4f07..0b851e78 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -78,7 +78,7 @@ <a mfb-button icon="ion-arrow-right-c" label="next event" ng-click="jumpToEvent(nextId,1);"></a> <a mfb-button icon="ion-arrow-left-c" label="prev. event" ng-click="jumpToEvent(prevId,-1);"></a> - <a mfb-button icon="ion-arrow-resize" label="fit image" ng-click="scaleImage();"></a> + <a mfb-button icon="ion-arrow-resize" label="{{imageFit?'fill screen':'fit screen'}}" ng-click="scaleImage();"></a> <a mfb-button icon="ion-close" label="exit event view" ng-click="closeModal()"> </a> diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html index 65e99803..2bb90dfb 100644 --- a/www/templates/monitors-modal.html +++ b/www/templates/monitors-modal.html @@ -56,7 +56,7 @@ </ion-modal-view> <nav mfb-menu position="br" effect="zoomin" label="collapse" active-icon="ion-chevron-down" resting-icon="ion-chevron-up" toggling-method="click"> - <button mfb-button icon="ion-arrow-resize" label="fit image" ng-click="scaleImage();"> + <button mfb-button icon="ion-arrow-resize" label="{{imageFit?'fill screen':'fit screen'}}" ng-click="scaleImage();"> </button> <button mfb-button icon="ion-refresh" label="refresh" ng-click="reloadView();"> </button> |