diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-28 08:42:09 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-09-28 08:42:09 -0400 |
| commit | ef7709d30ac5eb41dec7209c34c41d9b496003eb (patch) | |
| tree | 9b0415478983513659c32a584f89c364faf4e06a | |
| parent | 89366c5e2de9aa76055106b8883894d779fddf9b (diff) | |
dont call mobile accessory if on desktop
Former-commit-id: 331a307d23a208b5fadb1b29c296c35802e6aab5
| -rw-r--r-- | plugins/fetch.json | 18 | ||||
| -rw-r--r-- | www/js/EventCtrl.js | 4 | ||||
| -rw-r--r-- | www/js/app.js | 5 |
3 files changed, 16 insertions, 11 deletions
diff --git a/plugins/fetch.json b/plugins/fetch.json index 62cfa741..27ba9870 100644 --- a/plugins/fetch.json +++ b/plugins/fetch.json @@ -202,15 +202,6 @@ "is_top_level": true, "variables": {} }, - "cordova-plugin-certificates": { - "source": { - "type": "git", - "url": "https://github.com/hypery2k/cordova-certificate-plugin", - "subdir": "." - }, - "is_top_level": true, - "variables": {} - }, "cordova-plugin-settings-hook": { "source": { "type": "registry", @@ -236,5 +227,14 @@ }, "is_top_level": false, "variables": {} + }, + "cordova-plugin-certificates": { + "source": { + "type": "git", + "url": "https://github.com/hypery2k/cordova-certificate-plugin", + "subdir": "." + }, + "is_top_level": true, + "variables": {} } }
\ No newline at end of file diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index 53511651..cbfc172e 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -88,7 +88,9 @@ angular.module('zmApp.controllers') // collection repeat, so lets re-get the text size if it has changed // note that there may be a delay as its a callback - so might involve // a UI jiggle - MobileAccessibility.getTextZoom(getTextZoomCallback); + + if ($rootScope.platformOS != "desktop") + MobileAccessibility.getTextZoom(getTextZoomCallback); eventsListDetailsHeight = parseInt(zm.eventsListDetailsHeight * $rootScope.textScaleFactor); eventsListScrubHeight = parseInt(zm.eventsListScrubHeight * $rootScope.textScaleFactor); diff --git a/www/js/app.js b/www/js/app.js index 1c366c41..034a89c6 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -29,6 +29,7 @@ angular.module('zmApp', [ 'ionic-native-transitions', 'mgo-angular-wizard', 'pascalprecht.translate' + @@ -1108,7 +1109,7 @@ angular.module('zmApp', [ $rootScope.textScaleFactor = 1.0; - MobileAccessibility.getTextZoom(getTextZoomCallback); + $rootScope.db = null; $rootScope.runMode = NVRDataModel.getBandwidth(); @@ -1123,6 +1124,8 @@ angular.module('zmApp', [ NVRDataModel.log("You are running on " + $rootScope.platformOS); + if ($rootScope.platformOS != "desktop") + MobileAccessibility.getTextZoom(getTextZoomCallback); localforage.config({ name: zm.dbName |