Skip to content

Commit d085188

Browse files
author
Cube
authored
Merge pull request #149 from Dynamsoft/9.x
9.x
2 parents 641f0cc + f1f46a1 commit d085188

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+104
-103
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ __pycache__
2828
package-lock.json
2929
yarn.lock
3030
.git
31+
.npmrc
3132
/*.zip
3233
/*.py
3334
/*.exe

‎1.hello-world/1.hello-world.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
Loading...
15-
<script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/dbr.js"></script>
15+
<script src="https://cdn.jsdelivr.net/npm/[email protected].32/dist/dbr.js"></script>
1616
<script>
1717
if(location.protocol === "file:") {
1818
const message = `The page is opened via file:// and "BarcodeScanner" may not work properly. Please open the page via https:// or host it on "http://localhost/".`;
@@ -30,7 +30,7 @@
3030
/**
3131
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
3232
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
33-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
33+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
3434
* LICENSE ALERT - THE END
3535
*/
3636

‎1.hello-world/10.read-video-pwa/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ First, create a file with the name "helloworld-pwa.html" and fill it with the fo
2626
<body>
2727
<h1 style="font-size: 1.5em;">Hello World for PWA</h1>
2828
Loading...
29-
<script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/dbr.js"></script>
29+
<script src="https://cdn.jsdelivr.net/npm/[email protected].32/dist/dbr.js"></script>
3030
<script>
3131
Dynamsoft.DBR.BarcodeReader.license = 'DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9';
3232
(async function() {
@@ -184,9 +184,11 @@ For offline use, you need to cache more files.
184184

185185
service-worker.js
186186
```javascript
187-
const dbrVersion = "9.6.31";
188-
const dbrCdn = `https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@${dbrVersion}/dist/`;
187+
const dbrCdn = `https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@9.6.32/dist/`;
188+
const dbrVersion = dbrCdn.match(/(?<=dynamsoft-javascript-barcode@).+(?=\/dist)/)[0];
189189

190+
// Files to cache
191+
const cacheName = 'helloworld-pwa';
190192
const appShellFiles = [
191193
'./helloworld-pwa.html',
192194
'./dynamsoft-192x192.png',

‎1.hello-world/10.read-video-pwa/helloworld-pwa.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<body>
2222
<h1 style="font-size: 1.5em;">Hello World for PWA</h1>
2323
Loading...
24-
<script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/dbr.js"></script>
24+
<script src="https://cdn.jsdelivr.net/npm/[email protected].32/dist/dbr.js"></script>
2525
<script>
2626
if(location.protocol === "file:") {
2727
const message = `The page is opened via file:// and "BarcodeScanner" may not work properly. Please open the page via https:// or host it on "http://localhost/".`;
@@ -39,7 +39,7 @@ <h1 style="font-size: 1.5em;">Hello World for PWA</h1>
3939
/**
4040
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
4141
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
42-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
42+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
4343
* LICENSE ALERT - THE END
4444
*/
4545

‎1.hello-world/10.read-video-pwa/service-worker.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const dbrVersion = "9.6.31";
2-
const dbrCdn = `https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@${dbrVersion}/dist/`;
1+
const dbrCdn = `https://cdn.jsdelivr.net/npm/dynamsoft-javascript-barcode@9.6.32/dist/`;
2+
const dbrVersion = dbrCdn.match(/(?<=dynamsoft-javascript-barcode@).+(?=\/dist)/)[0];
33

44
// Files to cache
55
const cacheName = 'helloworld-pwa';

‎1.hello-world/11.read-video-requirejs.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1 style="font-size: 1.5em;">Hello World for RequireJS</h1>
2020
}
2121
</script>
2222
<script>
23-
requirejs(['https://cdn.jsdelivr.net/npm/[email protected].31/dist/dbr.js'], function({
23+
requirejs(['https://cdn.jsdelivr.net/npm/[email protected].32/dist/dbr.js'], function({
2424
BarcodeReader,
2525
BarcodeScanner
2626
}) {
@@ -33,11 +33,11 @@ <h1 style="font-size: 1.5em;">Hello World for RequireJS</h1>
3333
/**
3434
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
3535
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
36-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
36+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
3737
* LICENSE ALERT - THE END
3838
*/
3939

40-
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].31/dist/";
40+
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].32/dist/";
4141
(async function() {
4242
try {
4343
const scanner = await BarcodeScanner.createInstance();

‎1.hello-world/12.read-video-es6.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h1 style="font-size: 1.5em;">Hello World for ES6</h1>
2020
}
2121
</script>
2222
<script type="module">
23-
import { BarcodeReader, BarcodeScanner } from 'https://cdn.jsdelivr.net/npm/[email protected].31/dist/dbr.mjs';
23+
import { BarcodeReader, BarcodeScanner } from 'https://cdn.jsdelivr.net/npm/[email protected].32/dist/dbr.mjs';
2424
/** LICENSE ALERT - README
2525
* To use the library, you need to first specify a license key using the API "license" as shown below.
2626
*/
@@ -30,11 +30,11 @@ <h1 style="font-size: 1.5em;">Hello World for ES6</h1>
3030
/**
3131
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
3232
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
33-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
33+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
3434
* LICENSE ALERT - THE END
3535
*/
3636

37-
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].31/dist/";
37+
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].32/dist/";
3838

3939
(async () => {
4040
try {

‎1.hello-world/13.read-video-react-hooks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@types/node": "^16.18.12",
1212
"@types/react": "^18.0.27",
1313
"@types/react-dom": "^18.0.10",
14-
"dynamsoft-javascript-barcode": "^9.6.31",
14+
"dynamsoft-javascript-barcode": "^9.6.32",
1515
"react": "^18.2.0",
1616
"react-dom": "^18.2.0",
1717
"react-scripts": "5.0.1",

‎1.hello-world/13.read-video-react-hooks/src/dbr.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ BarcodeReader.license = 'DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9';
99
/**
1010
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
1111
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
12-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
12+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
1313
* LICENSE ALERT - THE END
1414
*/
1515

16-
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].31/dist/";
16+
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].32/dist/";

‎1.hello-world/14.read-video-webview/android/app/src/main/assets/decodeBarcodeInVideo.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
Loading...
15-
<script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/dbr.js"></script>
15+
<script src="https://cdn.jsdelivr.net/npm/[email protected].32/dist/dbr.js"></script>
1616
<script>
1717
/** LICENSE ALERT - README
1818
* To use the library, you need to first specify a license key using the API "license" as shown below.
@@ -23,7 +23,7 @@
2323
/**
2424
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
2525
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
26-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
26+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
2727
* LICENSE ALERT - THE END
2828
*/
2929

‎1.hello-world/14.read-video-webview/ios/dbrjswebview/html/decodeFileInVideo.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<body>
1414
Loading...
15-
<script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/dbr.js"></script>
15+
<script src="https://cdn.jsdelivr.net/npm/[email protected].32/dist/dbr.js"></script>
1616
<script>
1717
/** LICENSE ALERT - README
1818
* To use the library, you need to first specify a license key using the API "license" as shown below.
@@ -22,7 +22,7 @@
2222
/**
2323
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
2424
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
25-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
25+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
2626
* LICENSE ALERT - THE END
2727
*/
2828

‎1.hello-world/2.read-an-image.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h1 style="font-size: 1.5em;">Read Barcode from Images</h1>
3030
border: solid 1px gray;
3131
}
3232
</style>
33-
<script src="https://cdn.jsdelivr.net/npm/[email protected].31/dist/dbr.js"></script>
33+
<script src="https://cdn.jsdelivr.net/npm/[email protected].32/dist/dbr.js"></script>
3434
<script>
3535
/** LICENSE ALERT - README
3636
* To use the library, you need to first specify a license key using the API "license" as shown below.
@@ -41,7 +41,7 @@ <h1 style="font-size: 1.5em;">Read Barcode from Images</h1>
4141
/**
4242
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
4343
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
44-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
44+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
4545
* LICENSE ALERT - THE END
4646
*/
4747

‎1.hello-world/3.read-video-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@angular/platform-browser": "^15.2.0",
1919
"@angular/platform-browser-dynamic": "^15.2.0",
2020
"@angular/router": "^15.2.0",
21-
"dynamsoft-javascript-barcode": "^9.6.31",
21+
"dynamsoft-javascript-barcode": "^9.6.32",
2222
"rxjs": "~7.8.0",
2323
"tslib": "^2.3.0",
2424
"zone.js": "~0.12.0"

‎1.hello-world/3.read-video-angular/src/app/dbr.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ BarcodeReader.license = 'DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9';
99
/**
1010
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
1111
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
12-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
12+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
1313
* LICENSE ALERT - THE END
1414
*/
1515

16-
BarcodeReader.engineResourcePath = 'https://cdn.jsdelivr.net/npm/[email protected].31/dist/';
16+
BarcodeReader.engineResourcePath = 'https://cdn.jsdelivr.net/npm/[email protected].32/dist/';

‎1.hello-world/3.read-video-angular/src/assets/.gitkeep

Whitespace-only changes.

‎1.hello-world/4.read-video-react/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@types/node": "^16.11.45",
1212
"@types/react": "^18.0.15",
1313
"@types/react-dom": "^18.0.6",
14-
"dynamsoft-javascript-barcode": "^9.6.31",
14+
"dynamsoft-javascript-barcode": "^9.6.32",
1515
"react": "^18.2.0",
1616
"react-dom": "^18.2.0",
1717
"react-scripts": "5.0.1",

‎1.hello-world/4.read-video-react/src/dbr.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ BarcodeReader.license = 'DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9';
99
/**
1010
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
1111
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
12-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
12+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
1313
* LICENSE ALERT - THE END
1414
*/
1515

16-
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].31/dist/";
16+
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].32/dist/";

‎1.hello-world/5.read-video-vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"preview": "vite preview --port 4173"
88
},
99
"dependencies": {
10-
"dynamsoft-javascript-barcode": "^9.6.31",
10+
"dynamsoft-javascript-barcode": "^9.6.32",
1111
"vue": "^2.7.7"
1212
},
1313
"devDependencies": {

‎1.hello-world/5.read-video-vue/src/dbr.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ BarcodeReader.license = 'DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9';
99
/**
1010
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
1111
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
12-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
12+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
1313
* LICENSE ALERT - THE END
1414
*/
1515

16-
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].31/dist/";
16+
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].32/dist/";

‎1.hello-world/6.read-video-vue3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"type-check": "vue-tsc --noEmit"
1111
},
1212
"dependencies": {
13-
"dynamsoft-javascript-barcode": "^9.6.31",
13+
"dynamsoft-javascript-barcode": "^9.6.32",
1414
"vue": "^3.2.47"
1515
},
1616
"devDependencies": {

‎1.hello-world/6.read-video-vue3/src/dbr.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ BarcodeReader.license = 'DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9';
99
/**
1010
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
1111
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
12-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
12+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
1313
* LICENSE ALERT - THE END
1414
*/
1515

16-
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].31/dist/";
16+
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].32/dist/";

‎1.hello-world/7.read-video-nextjs/dbr.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ BarcodeReader.license = 'DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9';
99
/**
1010
* You can visit https://www.dynamsoft.com/customer/license/trialLicense?utm_source=github&product=dbr&package=js to get your own trial license good for 30 days.
1111
* Note that if you downloaded this sample from Dynamsoft while logged in, the above license key may already be your own 30-day trial license.
12-
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.31&utm_source=github#specify-the-license or contact [email protected].
12+
* For more information, see https://www.dynamsoft.com/barcode-reader/programming/javascript/user-guide/?ver=9.6.32&utm_source=github#specify-the-license or contact [email protected].
1313
* LICENSE ALERT - THE END
1414
*/
1515

16-
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].31/dist/";
16+
BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].32/dist/";

‎1.hello-world/7.read-video-nextjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@types/node": "18.15.3",
1313
"@types/react": "18.0.28",
1414
"@types/react-dom": "18.0.11",
15-
"dynamsoft-javascript-barcode": "^9.6.31",
15+
"dynamsoft-javascript-barcode": "^9.6.32",
1616
"next": "13.2.4",
1717
"react": "18.2.0",
1818
"react-dom": "18.2.0",

0 commit comments

Comments
 (0)