remove 'barcodeFormatString_2';

Cube-J · Cube-J · commit 2f87b7a76f65 · 2022-12-08T14:33:19.000+08:00
diff --git a/1.hello-world/1.hello-world.html b/1.hello-world/1.hello-world.html
@@ -37,7 +37,7 @@
                 scanner.onFrameRead = results => {
                     console.log("Barcodes on one frame:");
                     for (let result of results) {
-                        const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                        const format = result.barcodeFormatString;
                         console.log(format + ": " + result.barcodeText);
                     }
                 };
diff --git a/1.hello-world/10.read-video-pwa/helloworld-pwa.html b/1.hello-world/10.read-video-pwa/helloworld-pwa.html
@@ -56,7 +56,7 @@ <h1 style="font-size: 1.5em;">Hello World for PWA</h1>
                 scanner.onFrameRead = results => {
                     console.log("Barcodes on one frame:");
                     for (let result of results) {
-                        const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                        const format = result.barcodeFormatString;
                         console.log(format + ": " + result.barcodeText);
                     }
                 };
diff --git a/1.hello-world/11.read-video-requirejs.html b/1.hello-world/11.read-video-requirejs.html
@@ -38,7 +38,7 @@ <h1 style="font-size: 1.5em;">Hello World for RequireJS</h1>
                     scanner.onFrameRead = results => {
                         console.log("Barcodes on one frame:");
                         for (let result of results) {
-                            const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                            const format = result.barcodeFormatString;
                             console.log(format + ": " + result.barcodeText);
                         }
                     };
diff --git a/1.hello-world/12.read-video-es6.html b/1.hello-world/12.read-video-es6.html
@@ -40,7 +40,7 @@ <h1 style="font-size: 1.5em;">Hello World for ES6</h1>
                  scanner.onFrameRead = results => {
                     console.log("Barcodes on one frame:");
                     for (let result of results) {
-                        const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                        const format = result.barcodeFormatString;
                         console.log(format + ": " + result.barcodeText);
                     }
                 };
diff --git a/1.hello-world/2.read-an-image.html b/1.hello-world/2.read-an-image.html
@@ -95,7 +95,7 @@ <h1 style="font-size: 1.5em;">Read Barcode from Images</h1>
                     divResults.appendChild(createEl('p', "No Barcode Found!"));
                 }
                 for (let result of results) {
-                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    const format = result.barcodeFormatString;
                     iptReadonlyLastResult.value = format + ": " + result.barcodeText; // show last txt result
                     const p = document.createElement('p');
                     p.appendChild(createEl('span', format + ": "));
diff --git a/2.ui-tweaking/1.read-video-show-result.html b/2.ui-tweaking/1.read-video-show-result.html
@@ -69,7 +69,7 @@ <h1 style="font-size: 1.5em;">Use the Default Built-in UI</h1>
                 scanner.onFrameRead = (_results) => {
                     for (let result of _results) {
                         let newElements = [];
-                        const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                        const format = result.barcodeFormatString;
                         newElements.push(createASpan(format + ": "));
                         newElements.push(createASpan(result.barcodeText, "resultText"));
                         newElements.push(document.createElement('br'));
@@ -84,7 +84,7 @@ <h1 style="font-size: 1.5em;">Use the Default Built-in UI</h1>
                     }
                 };
                 scanner.onUniqueRead = (txt, result) => {
-                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    const format = result.barcodeFormatString;
                     document.getElementById('result').value = format + ": " + txt;
                     document.getElementById('result').focus();
                     setTimeout(() => {
diff --git a/2.ui-tweaking/2.read-video-no-extra-control.html b/2.ui-tweaking/2.read-video-no-extra-control.html
@@ -61,7 +61,7 @@ <h1 style="font-size: 1.5em;">Hide UI Controls</h1>
             try {
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 scanner.onUniqueRead = (txt, result) => {
-                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    const format = result.barcodeFormatString;
                     document.getElementById('result').value = format + ": " + txt;
                     document.getElementById('result').focus();
                     setTimeout(() => {
diff --git a/2.ui-tweaking/3.read-video-with-external-control.html b/2.ui-tweaking/3.read-video-with-external-control.html
@@ -123,7 +123,7 @@ <h1 style="font-size: 1.5em;">Customized UI</h1>
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 await scanner.setUIElement(document.getElementById('div-ui-container'));
                 scanner.onUniqueRead = (txt, result) => {
-                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    const format = result.barcodeFormatString;
                     document.getElementById('result').value = format + ": " + txt;
                     document.getElementById('result').focus();
                     setTimeout(() => {
diff --git a/2.ui-tweaking/4.difference-video-size.html b/2.ui-tweaking/4.difference-video-size.html
@@ -86,7 +86,7 @@ <h1 style="font-size: 1.5em;">Enlarge the Video Stream</h1>
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 await scanner.setUIElement(document.getElementById('div-ui-container'));
                 scanner.onUniqueRead = (txt, result) => {
-                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    const format = result.barcodeFormatString;
                     document.getElementById('result').value = format + ": " + txt;
                     if (fitPage.hidden)
                         exitFullPage();
diff --git a/2.ui-tweaking/5.read-video-with-custom-default-ui.html b/2.ui-tweaking/5.read-video-with-custom-default-ui.html
@@ -90,7 +90,7 @@ <h1>Customized Default UI</h1>
                 let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());
                 document.getElementById('UIElement').appendChild(scanner.getUIElement());
                 scanner.onUniqueRead = (txt, result) => {
-                    const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                    const format = result.barcodeFormatString;
                     document.getElementById('result').value = format + ": " + txt;
                     document.getElementById('result').focus();
                     setTimeout(() => {
diff --git a/3.settings/6.dense-barcodes.html b/3.settings/6.dense-barcodes.html
@@ -60,9 +60,7 @@
           scanner.onFrameRead = (results) => {
             textareaResults.value = "";
             for (let result of results) {
-              const format = result.barcodeFormat
-                ? result.barcodeFormatString
-                : result.barcodeFormatString_2;
+              const format = result.barcodeFormatString;
               const text = result.barcodeText;
               textareaResults.value += `${format}: ${text}\n`;
             }
diff --git a/3.settings/initScanner.js b/3.settings/initScanner.js
@@ -78,7 +78,7 @@ async function startReading() {
         let scanner = await pScanner;
         scanner.onFrameRead = (_results) => {
             for (let result of _results) {
-                const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;
+                const format = result.barcodeFormatString;
                 resultBox.value = format + ": " + result.barcodeText;
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`scanner.onFrameRead = results => {`
`38`	`38`	`console.log("Barcodes on one frame:");`
`39`	`39`	`for (let result of results) {`
`40`		`- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;`
	`40`	`+ const format = result.barcodeFormatString;`
`41`	`41`	`console.log(format + ": " + result.barcodeText);`
`42`	`42`	`}`
`43`	`43`	`};`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ <h1 style="font-size: 1.5em;">Hello World for PWA</h1>`
`56`	`56`	`scanner.onFrameRead = results => {`
`57`	`57`	`console.log("Barcodes on one frame:");`
`58`	`58`	`for (let result of results) {`
`59`		`- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;`
	`59`	`+ const format = result.barcodeFormatString;`
`60`	`60`	`console.log(format + ": " + result.barcodeText);`
`61`	`61`	`}`
`62`	`62`	`};`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ <h1 style="font-size: 1.5em;">Hello World for RequireJS</h1>`
`38`	`38`	`scanner.onFrameRead = results => {`
`39`	`39`	`console.log("Barcodes on one frame:");`
`40`	`40`	`for (let result of results) {`
`41`		`- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;`
	`41`	`+ const format = result.barcodeFormatString;`
`42`	`42`	`console.log(format + ": " + result.barcodeText);`
`43`	`43`	`}`
`44`	`44`	`};`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ <h1 style="font-size: 1.5em;">Hello World for ES6</h1>`
`40`	`40`	`scanner.onFrameRead = results => {`
`41`	`41`	`console.log("Barcodes on one frame:");`
`42`	`42`	`for (let result of results) {`
`43`		`- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;`
	`43`	`+ const format = result.barcodeFormatString;`
`44`	`44`	`console.log(format + ": " + result.barcodeText);`
`45`	`45`	`}`
`46`	`46`	`};`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ <h1 style="font-size: 1.5em;">Read Barcode from Images</h1>`
`95`	`95`	`divResults.appendChild(createEl('p', "No Barcode Found!"));`
`96`	`96`	`}`
`97`	`97`	`for (let result of results) {`
`98`		`- const format = result.barcodeFormat ? result.barcodeFormatString : result.barcodeFormatString_2;`
	`98`	`+ const format = result.barcodeFormatString;`
`99`	`99`	`iptReadonlyLastResult.value = format + ": " + result.barcodeText; // show last txt result`
`100`	`100`	`const p = document.createElement('p');`
`101`	`101`	`p.appendChild(createEl('span', format + ": "));`