Skip to content
Snippets Groups Projects
Commit 48ae2f43 authored by Bertrand Presles's avatar Bertrand Presles
Browse files

Disabled barcode for OSX

parent d86b1bea
Branches feature/macos-support
Tags
No related merge requests found
Pipeline #7156 skipped
This diff is collapsed.
...@@ -94,7 +94,7 @@ angular.module("cesium.config", []) ...@@ -94,7 +94,7 @@ angular.module("cesium.config", [])
} }
}, },
"version": "1.4.12", "version": "1.4.12",
"build": "2019-11-05T15:23:40.710Z", "build": "2019-11-08T20:56:38.011Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new" "newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
}) })
......
...@@ -206,6 +206,10 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti ...@@ -206,6 +206,10 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
return !!navigator.userAgent.match(/iPhone | iPad | iPod/i) || ionic.Platform.isIOS(); return !!navigator.userAgent.match(/iPhone | iPad | iPod/i) || ionic.Platform.isIOS();
}; };
exports.isOSX = function() {
return !!navigator.userAgent.match(/Macintosh/i) || ionic.Platform.is("osx");
};
exports.isDesktop = function() { exports.isDesktop = function() {
if (!angular.isDefined(cache.isDesktop)) { if (!angular.isDefined(cache.isDesktop)) {
try { try {
...@@ -237,7 +241,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti ...@@ -237,7 +241,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
if (exports.enable){ if (exports.enable){
exports.camera.enable = !!navigator.camera; exports.camera.enable = !!navigator.camera;
exports.keyboard.enable = cordova && cordova.plugins && !!cordova.plugins.Keyboard; exports.keyboard.enable = cordova && cordova.plugins && !!cordova.plugins.Keyboard;
exports.barcode.enable = cordova && cordova.plugins && !!cordova.plugins.barcodeScanner; exports.barcode.enable = cordova && cordova.plugins && !!cordova.plugins.barcodeScanner && !this.isOSX();
exports.clipboard.enable = cordova && cordova.plugins && !!cordova.plugins.clipboard; exports.clipboard.enable = cordova && cordova.plugins && !!cordova.plugins.clipboard;
if (exports.keyboard.enable) { if (exports.keyboard.enable) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment