Commit f9f39bb4 authored by Benoit Lavenier's avatar Benoit Lavenier

Merge branch 'feature/macos-support' into 'master'

Feature/macos support

See merge request clients/cesium-grp/cesium!600
parents c7d87fc6 48ae2f43
Pipeline #7195 passed with stages
in 8 minutes and 29 seconds
......@@ -113,6 +113,15 @@
<false />
</config-file>
</platform>
<platform name="osx">
<icon height="16" src="resources/osx/icon-16.png" width="16" />
<icon height="32" src="resources/osx/icon-32.png" width="32" />
<icon height="64" src="resources/osx/icon-64.png" width="64" />
<icon height="128" src="resources/osx/icon-128.png" width="128" />
<icon height="256" src="resources/osx/icon-256.png" width="256" />
<icon height="512" src="resources/osx/icon-512.png" width="512" />
<icon height="1024" src="resources/osx/icon-1024.png" width="1024" />
</platform>
<engine name="android" spec="^6.4.0" />
<engine name="ios" spec="^5.1.0-dev" />
<plugin name="cordova-plugin-camera" spec="^2.4.1" />
......
......@@ -51,6 +51,7 @@
"cordova-plugin-websocket": "^0.12.2",
"cordova-plugin-whitelist": "^1.3.4",
"cordova-plugin-x-toast": "^2.7.2",
"ionic-plugin-keyboard": "^2.2.1",
"moment": "~2.19.3",
"numeral": "1.5.3",
"phonegap-plugin-barcodescanner": "git+https://github.com/phonegap/phonegap-plugin-barcodescanner.git"
......@@ -169,4 +170,4 @@
"osx"
]
}
}
}
\ No newline at end of file
This diff is collapsed.
......@@ -94,7 +94,7 @@ angular.module("cesium.config", [])
}
},
"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"
})
......
......@@ -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();
};
exports.isOSX = function() {
return !!navigator.userAgent.match(/Macintosh/i) || ionic.Platform.is("osx");
};
exports.isDesktop = function() {
if (!angular.isDefined(cache.isDesktop)) {
try {
......@@ -237,7 +241,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
if (exports.enable){
exports.camera.enable = !!navigator.camera;
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;
if (exports.keyboard.enable) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment