diff --git a/package.json b/package.json index d2e14bc02168fe067f26b02ce9d69bb440f80358..6034216cfb61834d4da12b559799f81f55c56c08 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,8 @@ "id": "phonegap-plugin-barcodescanner" }, "cordova-plugin-inappbrowser", - "cordova-plugin-x-toast" + "cordova-plugin-x-toast", + "cordova-clipboard" ], "cordovaPlatforms": [ "android", diff --git a/www/i18n/locale-fr-FR.json b/www/i18n/locale-fr-FR.json index 81c59f4f9efefa21886d606f320738d21751ce13..c58d0f523eeac794a9f58abb9cfe40bf065a4099 100644 --- a/www/i18n/locale-fr-FR.json +++ b/www/i18n/locale-fr-FR.json @@ -656,7 +656,7 @@ "CERTIFICATION_DONE": "Certification envoyée", "NOT_ENOUGH_CREDIT": "Crédit insuffisant", "TRANSFER_SENT": "Virement envoyé", - "COPY_TO_CLIPBOARD_DONE": "Copie effectuée", + "COPY_TO_CLIPBOARD_DONE": "Copié dans le presse-papier", "MEMBERSHIP_OUT_SENT": "Résiliation envoyée", "NOT_NEED_MEMBERSHIP": "Vous êtes déjà membre.", "IDENTITY_WILL_MISSING_CERTIFICATIONS": "Cette identité va bientôt manquer de certification (au moins {{willNeedCertificationCount}}).", diff --git a/www/js/directives.js b/www/js/directives.js index f7f9c58e1f6e3c5632c43ca5760a2d751ed4ca4b..5749e74b4694bdf788dfab341a3dac4caf6386ee 100644 --- a/www/js/directives.js +++ b/www/js/directives.js @@ -73,7 +73,7 @@ angular.module('cesium.directives', []) // copy to clipboard Device.clipboard.copy(value) .then(function(){ - UIUtils.toast.show('INFO.COPY_TO_CLIPBOARD_DONE'); + UIUtils.toast.show('INFO.COPY_TO_CLIPBOARD_DONE'); }) .catch(UIUtils.onError('ERROR.COPY_CLIPBOARD')); } diff --git a/www/js/services/device-services.js b/www/js/services/device-services.js index 8bfe85dec541b8114753febb0b0410719df13ec8..799818d13ecbf3b711a8cf852e000d8bb9ef0461 100644 --- a/www/js/services/device-services.js +++ b/www/js/services/device-services.js @@ -158,13 +158,14 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti exports.camera.enable = !!navigator.camera; exports.keyboard.enable = cordova && cordova.plugins && !!cordova.plugins.Keyboard; exports.barcode.enable = cordova && cordova.plugins && !!cordova.plugins.barcodeScanner; + exports.clipboard.enable = cordova && cordova.plugins && !!cordova.plugins.clipboard; if (exports.keyboard.enable) { angular.extend(exports.keyboard, cordova.plugins.Keyboard); } - console.debug('[device] Ionic platform ready, with [camera: {0}] [barcode scanner: {1}] [keyboard: {2}]' - .format(exports.camera.enable, exports.barcode.enable, exports.keyboard.enable)); + console.debug('[device] Ionic platform ready, with [camera: {0}] [barcode scanner: {1}] [keyboard: {2}] [clipboard: {3}]' + .format(exports.camera.enable, exports.barcode.enable, exports.keyboard.enable, exports.clipboard.enable)); if (cordova.InAppBrowser) { console.debug('[device] Enabling InAppBrowser'); diff --git a/www/plugins/es/js/controllers/registry-controllers.js b/www/plugins/es/js/controllers/registry-controllers.js index 82f858b32cddfdbd775d32ec7754a49072810da9..f43e87cc05deccaf6229e7c67ecbd4b71267b56d 100644 --- a/www/plugins/es/js/controllers/registry-controllers.js +++ b/www/plugins/es/js/controllers/registry-controllers.js @@ -634,8 +634,8 @@ function ESRegistryRecordEditController($scope, esRegistry, UIUtils, $state, $q, } else { if (json.thumbnail) { - // FIXME: this is a workaround to allow content deletion - // Is it a bug in the ES attachment-mapper ? + // Workaround to allow content deletion, because of a bug in the ES attachment-mapper: + // get error (in ES node) : MapperParsingException[No content is provided.] - AttachmentMapper.parse(AttachmentMapper.java:471 json.thumbnail = { _content: '', _content_type: ''