diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/MontageCtrl.js | 35 | ||||
| -rw-r--r-- | www/js/angular-circular-navigation.js | 4 | ||||
| -rw-r--r-- | www/js/app.js | 2 |
3 files changed, 33 insertions, 8 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index b95d2553..1c0c7b90 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -287,15 +287,13 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' }); //--------------------------------------------------------- - // slider is tied to the view slider for montage - //Remember not to use a variable. I'm using an object - // so it's passed as a reference - otherwise it makes - // a copy and the value never changes + // This function readjusts montage size + // and stores current size to persistent memory //--------------------------------------------------------- - $scope.sliderChanged = function () + function processSliderChanged() { - console.log('Slider has changed'); + console.log('Slider has changed'); ZMDataModel.setMontageSize($scope.slider.monsize); console.log("Rootscope Montage is " + ZMDataModel.getMontageSize() + " and slider montage is " + $scope.slider.monsize); @@ -313,6 +311,31 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' monsizestring = monsizestring.slice(0,-1); // kill last : console.log ("Setting monsize string:"+monsizestring); window.localStorage.setItem("montageArraySize", monsizestring); + } + + //--------------------------------------------------------- + // In full screen montage view, I call this function + // as slider is hidden + //--------------------------------------------------------- + + $scope.changeSize = function (val) + { + $scope.slider.monsize += val; + if ($scope.slider.monsize < 1) $scope.slider.monsize = 1; + if ($scope.slider.monsize > 6) $scope.slider.monsize = 6; + processSliderChanged(); + }; + + //--------------------------------------------------------- + // slider is tied to the view slider for montage + //Remember not to use a variable. I'm using an object + // so it's passed as a reference - otherwise it makes + // a copy and the value never changes + //--------------------------------------------------------- + + $scope.sliderChanged = function () + { + processSliderChanged(); }; diff --git a/www/js/angular-circular-navigation.js b/www/js/angular-circular-navigation.js index f3b9b0a0..6f62a9e5 100644 --- a/www/js/angular-circular-navigation.js +++ b/www/js/angular-circular-navigation.js @@ -1,4 +1,8 @@ // PP - Modified to show at right angles +/* jshint -W041 */ +/* jslint browser: true*/ +/* global cordova,StatusBar,angular,console */ + (function () { 'use strict'; diff --git a/www/js/app.js b/www/js/app.js index 9831ef19..9bbecce4 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -40,7 +40,6 @@ angular.module('zmApp', [ // Also remember you need to add it to .config //------------------------------------------------------------------ .factory('timeoutHttpIntercept', function ($rootScope, $q) { - //console.log("*** HTTP INTERCEPTOR CALLED ***"); return { 'request': function (config) { if ( !(config.url.indexOf("stop.json") > -1 || @@ -54,7 +53,6 @@ angular.module('zmApp', [ { //console.log ("HTTP INTERCEPT:Skipping HTTP timeout for "+config.url); } - //console.log("*** HTTP URL INTERCEPTOR CALLED with "+config.url+" ***"); return config; } |