@sapui5/sap.ndc 1.96.36 → 1.96.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.ndc",
-  "version": "1.96.36",
+  "version": "1.96.38",
   "description": "SAPUI5 Library sap.ndc",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/ndc/.library

@@ -5,7 +5,7 @@
     <vendor>SAP SE</vendor>
     <copyright>SAPUI5
  * (c) Copyright 2009-2022 SAP SE. All rights reserved.</copyright>
-    <version>1.96.36</version>
+    <version>1.96.38</version>
 
     <documentation>SAPUI5 library with controls with native device capabilities.</documentation>
 

package/src/sap/ndc/BarcodeScanner.js

@@ -384,6 +384,14 @@ sap.ui.define([
 	function loadZXingCPPAPI() {
 		Log.debug("BarcodeScanner.loadZXingCPPAPI: load ZXingCPP API");
 		updateScannerAPI("ZXingCPP", oScannerAPIStatus.Loading);
+		var oBusyDialog = oModel.getProperty("/busyDialog");
+		if (!oBusyDialog) {
+			var newBusyDialog = new BusyDialog({
+				title: oResourceModel.getProperty("BARCODE_DIALOG_BUSY_TITLE"),
+				text: oResourceModel.getProperty("BARCODE_DIALOG_BUSY_TEXT_ZXINGCPP")
+			});
+			oModel.setProperty("/busyDialog", newBusyDialog);
+		}
 		sap.ui.require([
 			"sap/ndc/thirdparty/zxingcpp/zxing_reader"
 		], function (ZXing) {
@@ -394,8 +402,18 @@ sap.ui.define([
 			}
 			Log.debug("BarcodeScanner.loadZXingCPPAPI: ZXingCPP API is Initial!");
 			updateScannerAPI("ZXingCPP", oScannerAPIStatus.Initial);
+			var oBusyDialog = oModel.getProperty("/busyDialog");
+			if (oBusyDialog) {
+				oBusyDialog.close();
+				oModel.setProperty("/busyDialog", null);
+			}
 		}, function (oError) {
 			loadZXingCPPFailed("BarcodeScanner.loadZXingCPPAPI: ZXingCPP API is unavailable.\n" + oError);
+			var oBusyDialog = oModel.getProperty("/busyDialog");
+			if (oBusyDialog) {
+				oBusyDialog.close();
+				oModel.setProperty("/busyDialog", null);
+			}
 		});
 	}
 
@@ -1050,7 +1068,15 @@ sap.ui.define([
 	 * @private
 	 */
 	 function scanWithZXingCPP() {
-		if (checkScannerAPIStatus("ZXingCPP", oScannerAPIStatus.Initial)) {
+		var oZXingCPP = oModel.getProperty("/apis/ZXingCPP/instance");
+		var oBusyDialog = oModel.getProperty("/busyDialog");
+		if (!oZXingCPP && checkScannerAPIStatus("ZXingCPP", oScannerAPIStatus.Loading) && oBusyDialog) {
+			oBusyDialog.open();
+			Log.debug("BarcodeScanner.scanWithZXingCPP: zxing_reader file is loading.");
+			setTimeout(function() {
+				scanWithZXingCPP();
+			}, 0);
+		} else if (checkScannerAPIStatus("ZXingCPP", oScannerAPIStatus.Initial)) {
 			Log.debug("BarcodeScanner.scanWithZXingCPP: ZXingCPP instances is not loaded, start to load them.");
 			loadZXingCPPInstance(function() {
 				openScanDialog();

package/src/sap/ndc/library.js

@@ -32,7 +32,7 @@ sap.ui.define(['sap/m/library', 'sap/ui/core/library'],
 		],
 		elements: [],
 		noLibraryCSS: true,
-		version: "1.96.36"
+		version: "1.96.38"
 	});
 
 	return sap.ndc;