Merge branch 'master' of https://github.com/Dynamsoft/barcode-reader-javascript-samples

Keillion · Keillion · commit 91010a21e91b · 2022-02-21T16:18:50.000+08:00
diff --git a/1.hello-world/1.minimum-code.html b/1.hello-world/1.minimum-code.html
@@ -15,6 +15,7 @@ <h1 style="font-size: 1.5em;">Read Barcodes from a Camera</h1>
     <button id="btn-show-scanner">Show Barcode Scanner</button>
     <script>
         /** LICENSE ALERT - README
+         *
          * The library requires a license to work.
          * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
          * Note that network connection is required for the public license to work.
@@ -25,10 +26,7 @@ <h1 style="font-size: 1.5em;">Read Barcodes from a Camera</h1>
 
         // Dynamsoft.DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
-
-
-
-
+        /** LICENSE ALERT - THE END */
 
         let pScanner = null;
         document.getElementById('btn-show-scanner').onclick = async function() {
diff --git a/1.hello-world/10.read-video-pwa/helloworld-pwa.html b/1.hello-world/10.read-video-pwa/helloworld-pwa.html
@@ -16,6 +16,7 @@ <h1 style="font-size: 1.5em;">Hello World for PWA</h1>
     <button id='readBarcode'>Read Barcode via Camera</button>
     <script>
         /** LICENSE ALERT - README
+         *
          * The library requires a license to work.
          * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
          * Note that network connection is required for the public license to work.
@@ -25,6 +26,8 @@ <h1 style="font-size: 1.5em;">Hello World for PWA</h1>
         /* When using your own license, uncomment the following line and specify your license. */
 
         // Dynamsoft.DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
+        
+        /** LICENSE ALERT - THE END */
 
         let pScanner = null;
         let latestResult = null;
diff --git a/1.hello-world/11.read-video-requirejs.html b/1.hello-world/11.read-video-requirejs.html
@@ -19,6 +19,7 @@ <h1 style="font-size: 1.5em;">Hello World for RequireJS</h1>
             BarcodeScanner
         }) {
             /** LICENSE ALERT - README
+             *
              * The library requires a license to work.
              * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
              * Note that network connection is required for the public license to work.
@@ -28,6 +29,8 @@ <h1 style="font-size: 1.5em;">Hello World for RequireJS</h1>
             /* When using your own license, uncomment the following line and specify your license. */
 
             // BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
+            
+            /** LICENSE ALERT - THE END */
 
             BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/";
             let pScanner = null;
diff --git a/1.hello-world/12.read-video-webpack/src/index.js b/1.hello-world/12.read-video-webpack/src/index.js
@@ -1,25 +1,20 @@
 import DBR from "dynamsoft-javascript-barcode";
 
 /** LICENSE ALERT - README
- * The library requires a license to work, you use the API organizationID to tell the program where to fetch your license.
- * If the Organizaion ID is not specified, a 7-day (public) trial license will be used by default which is the case in this sample.
- * Note that network connection is required for this license to work.
+ * 
+ * The library requires a license to work.
+ * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
+ * Note that network connection is required for the public license to work.
+ * For more info, please check https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=8.8.7&utm_source=github#specify-the-license or contact support@dynamsoft.com.
  */
 
-/* When using your own license, uncomment the following line and specify your Organization ID. */
+/* When using your own license, uncomment the following line and specify your license. */
 
-// Dynamsoft.DBR.organizationID = "YOUR-ORGANIZATION-ID";
-
-/* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
-/* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
-
-/* The API "productKeys" is an alternative way to license the library, the major difference is that it does not require a network. Contact support@dynamsoft.com for more information. */
-
-// Dynamsoft.DBR.productKeys = "YOUR-PRODUCT-KEY";
+// DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
 /** LICENSE ALERT - THE END */
 
-DBR.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/";
+DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/";
 
 let pScanner = null;
 if (document.getElementById('readBarcode')) {
diff --git a/1.hello-world/2.read-an-image.html b/1.hello-world/2.read-an-image.html
@@ -27,21 +27,21 @@ <h1 style="font-size: 1.5em;">Read Barcode from Images</h1>
     </style>
     <script>
         /** LICENSE ALERT - README
+         *
          * The library requires a license to work.
          * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
          * Note that network connection is required for the public license to work.
          * For more info, please check https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=8.8.7&utm_source=github#specify-the-license or contact support@dynamsoft.com.
          */
 
         /* When using your own license, uncomment the following line and specify your license. */
-        
-        // Dynamsoft.DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
-
 
+        // Dynamsoft.DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
+        /** LICENSE ALERT - THE END */
 
         // Load the library on page load to speed things up.
-        (async()=>{
+        (async() => {
             try {
                 await Dynamsoft.DBR.BarcodeReader.loadWasm();
                 document.getElementById('p-loading').style.display = 'none';
diff --git a/1.hello-world/3.read-video-angular/src/app/dbr.ts b/1.hello-world/3.read-video-angular/src/app/dbr.ts
@@ -1,6 +1,7 @@
 import DBR from "dynamsoft-javascript-barcode";
 
 /** LICENSE ALERT - README
+ * 
  * The library requires a license to work.
  * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
  * Note that network connection is required for the public license to work.
@@ -11,6 +12,8 @@ import DBR from "dynamsoft-javascript-barcode";
 
 // DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
+/** LICENSE ALERT - THE END */
+
 DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/";
 
 export default DBR;
diff --git a/1.hello-world/4.read-video-react/src/dbr.js b/1.hello-world/4.read-video-react/src/dbr.js
@@ -1,6 +1,7 @@
 import DBR from "dynamsoft-javascript-barcode";
 
 /** LICENSE ALERT - README
+ * 
  * The library requires a license to work.
  * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
  * Note that network connection is required for the public license to work.
@@ -11,6 +12,8 @@ import DBR from "dynamsoft-javascript-barcode";
 
 // DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
+/** LICENSE ALERT - THE END */
+
 DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/";
 
 export default DBR;
diff --git a/1.hello-world/5.read-video-vue/src/dbr.js b/1.hello-world/5.read-video-vue/src/dbr.js
@@ -1,6 +1,7 @@
 import DBR from "dynamsoft-javascript-barcode";
 
 /** LICENSE ALERT - README
+ * 
  * The library requires a license to work.
  * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
  * Note that network connection is required for the public license to work.
@@ -11,6 +12,8 @@ import DBR from "dynamsoft-javascript-barcode";
 
 // DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
+/** LICENSE ALERT - THE END */
+
 DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/";
 
 export default DBR;
diff --git a/1.hello-world/6.read-video-vue3/src/dbr.js b/1.hello-world/6.read-video-vue3/src/dbr.js
@@ -1,6 +1,7 @@
 import DBR from "dynamsoft-javascript-barcode";
 
 /** LICENSE ALERT - README
+ * 
  * The library requires a license to work.
  * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
  * Note that network connection is required for the public license to work.
@@ -11,6 +12,8 @@ import DBR from "dynamsoft-javascript-barcode";
 
 // DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
+/** LICENSE ALERT - THE END */
+
 DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/";
 
 export default DBR;
diff --git a/1.hello-world/7.read-video-nextjs/dbr.js b/1.hello-world/7.read-video-nextjs/dbr.js
@@ -1,21 +1,16 @@
 import DBR from "dynamsoft-javascript-barcode";
 
 /** LICENSE ALERT - README
- * The library requires a license to work, you use the API organizationID to tell the program where to fetch your license.
- * If the Organizaion ID is not specified, a 7-day (public) trial license will be used by default which is the case in this sample.
- * Note that network connection is required for this license to work.
+ * 
+ * The library requires a license to work.
+ * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
+ * Note that network connection is required for the public license to work.
+ * For more info, please check https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=8.8.7&utm_source=github#specify-the-license or contact support@dynamsoft.com.
  */
 
-/* When using your own license, uncomment the following line and specify your Organization ID. */
+/* When using your own license, uncomment the following line and specify your license. */
 
-// DBR.organizationID = "YOUR-ORGANIZATION-ID";
-
-/* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
-/* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
-
-/* The API "productKeys" is an alternative way to license the library, the major difference is that it does not require a network. Contact support@dynamsoft.com for more information. */
-
-// DBR.productKeys = "YOUR-PRODUCT-KEY";
+// DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
 /** LICENSE ALERT - THE END */
 
diff --git a/1.hello-world/8.read-video-nuxtjs/dbr.js b/1.hello-world/8.read-video-nuxtjs/dbr.js
@@ -1,24 +1,19 @@
 import DBR from "dynamsoft-javascript-barcode";
 
 /** LICENSE ALERT - README
- * The library requires a license to work, you use the API organizationID to tell the program where to fetch your license.
- * If the Organizaion ID is not specified, a 7-day (public) trial license will be used by default which is the case in this sample.
- * Note that network connection is required for this license to work.
+ *
+ * The library requires a license to work.
+ * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
+ * Note that network connection is required for the public license to work.
+ * For more info, please check https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=8.8.7&utm_source=github#specify-the-license or contact support@dynamsoft.com.
  */
 
-/* When using your own license, uncomment the following line and specify your Organization ID. */
+/* When using your own license, uncomment the following line and specify your license. */
 
-// DBR.organizationID = "YOUR-ORGANIZATION-ID";
-
-/* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
-/* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
-
-/* The API "productKeys" is an alternative way to license the library, the major difference is that it does not require a network. Contact support@dynamsoft.com for more information. */
-
-// DBR.productKeys = "YOUR-PRODUCT-KEY";
+// DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
 /** LICENSE ALERT - THE END */
 
 DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@8.8.7/dist/";
 
-export default DBR;
+export default DBR;
diff --git a/1.hello-world/9.read-video-electron/action.js b/1.hello-world/9.read-video-electron/action.js
@@ -1,24 +1,19 @@
 window.onload = function () {
     /** LICENSE ALERT - README
-     * The library requires a license to work, you use the API organizationID to tell the program where to fetch your license.
-     * If the Organizaion ID is not specified, a 7-day (public) trial license will be used by default which is the case in this sample.
-     * Note that network connection is required for this license to work.
+     * 
+     * The library requires a license to work.
+     * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
+     * Note that network connection is required for the public license to work.
+     * For more info, please check https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=8.8.7&utm_source=github#specify-the-license or contact support@dynamsoft.com.
      */
 
-    /* When using your own license, uncomment the following line and specify your Organization ID. */
+    /* When using your own license, uncomment the following line and specify your license. */
 
-    // Dynamsoft.DBR.organizationID = "YOUR-ORGANIZATION-ID";
-
-    /* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
-    /* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
-
-    /* The API "productKeys" is an alternative way to license the library, the major difference is that it does not require a network. Contact support@dynamsoft.com for more information. */
-
-    // Dynamsoft.DBR.productKeys = "YOUR-PRODUCT-KEY";
+    // Dynamsoft.DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
     /** LICENSE ALERT - THE END */
-    
-    Dynamsoft.DBR.loadWasm();
+
+    Dynamsoft.DBR.BarcodeReader.loadWasm();
     let pScanner = null;
     document.getElementById('readBarcode').onclick = async () => {
         try {
diff --git a/1.hello-world/README.md b/1.hello-world/README.md
@@ -10,7 +10,7 @@ Let's break down each of the samples
 
 In this sample, you will find the basic lines of code ncessary to initialize the library and set it up.
 
-Please note that if no license is specified in code via the `organizationID` property or the `productKeys` property, as shown in the commented lines of code, a 7-day public trial will be used starting from v8.2.5. In earlier versions, an error will be thrown if no license, trial or full, is specified.
+Please note that if no license is specified in code via the `organizationID` property or the `productKeys` property, as shown in the commented lines of code, a free public trial will be used starting from v8.2.5. In earlier versions, an error will be thrown if no license, trial or full, is specified.
 
 Let's quickly break down the methods used in order:
 
diff --git a/2.ui-tweaking/1.read-video-show-result.html b/2.ui-tweaking/1.read-video-show-result.html
@@ -28,21 +28,16 @@ <h1 style="font-size: 1.5em;">Use the Default Built-in UI</h1>
     </div>
     <script>
         /** LICENSE ALERT - README
-         * The library requires a license to work, you use the API organizationID to tell the program where to fetch your license.
-         * If the Organizaion ID is not specified, a 7-day (public) trial license will be used by default which is the case in this sample.
-         * Note that network connection is required for this license to work.
+         *
+         * The library requires a license to work.
+         * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
+         * Note that network connection is required for the public license to work.
+         * For more info, please check https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=8.8.7&utm_source=github#specify-the-license or contact support@dynamsoft.com.
          */
 
-        /* When using your own license, uncomment the following line and specify your Organization ID. */
+        /* When using your own license, uncomment the following line and specify your license. */
 
-        // Dynamsoft.DBR.organizationID = "YOUR-ORGANIZATION-ID";
-
-        /* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
-        /* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
-
-        /* The API "productKeys" is an alternative way to license the library, the major difference is that it does not require a network. Contact support@dynamsoft.com for more information. */
-
-        // Dynamsoft.DBR.productKeys = "YOUR-PRODUCT-KEY";
+        // Dynamsoft.DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
         /** LICENSE ALERT - THE END */
 
diff --git a/2.ui-tweaking/2.read-video-no-extra-control.html b/2.ui-tweaking/2.read-video-no-extra-control.html
@@ -23,21 +23,16 @@ <h1 style="font-size: 1.5em;">Hide UI Controllers</h1>
     </div>
     <script>
         /** LICENSE ALERT - README
-         * The library requires a license to work, you use the API organizationID to tell the program where to fetch your license.
-         * If the Organizaion ID is not specified, a 7-day (public) trial license will be used by default which is the case in this sample.
-         * Note that network connection is required for this license to work.
+         *
+         * The library requires a license to work.
+         * If the license is not specified, a free public trial license will be used by default which is the case in this sample.
+         * Note that network connection is required for the public license to work.
+         * For more info, please check https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=8.8.7&utm_source=github#specify-the-license or contact support@dynamsoft.com.
          */
 
-        /* When using your own license, uncomment the following line and specify your Organization ID. */
+        /* When using your own license, uncomment the following line and specify your license. */
 
-        // Dynamsoft.DBR.organizationID = "YOUR-ORGANIZATION-ID";
-
-        /* If you don't have a license yet, you can request a trial on this page: https://www.dynamsoft.com/customer/license/trialLicense?product=dbr&package=js&utm_source=samples */
-        /* For more information, please refer to https://www.dynamsoft.com/license-server/docs/about/licensefaq.html?ver=latest#how-to-use-a-trackable-license. */
-
-        /* The API "productKeys" is an alternative way to license the library, the major difference is that it does not require a network. Contact support@dynamsoft.com for more information. */
-
-        // Dynamsoft.DBR.productKeys = "YOUR-PRODUCT-KEY";
+        // Dynamsoft.DBR.BarcodeReader.license = "YOUR-ORGANIZATION-ID or YOUR-HANDSHAKECODE or AN-OFFLINE-LICENSE or ANY-OTHER-TYPE-OF-SUPPORTED-LICENSE-STRING";
 
         /** LICENSE ALERT - THE END */
 
diff --git a/2.ui-tweaking/3.read-video-with-external-control.html b/2.ui-tweaking/3.read-video-with-external-control.html
diff --git a/2.ui-tweaking/4.difference-video-size.html b/2.ui-tweaking/4.difference-video-size.html
diff --git a/3.settings/initScanner.js b/3.settings/initScanner.js
diff --git a/4.use-case/1.fill-a-form-with-barcode-reading.html b/4.use-case/1.fill-a-form-with-barcode-reading.html
diff --git a/4.use-case/2.read-a-drivers-license.html b/4.use-case/2.read-a-drivers-license.html
diff --git a/5.others/debug/public/index.html b/5.others/debug/public/index.html
