Skip to content

Commit 30254af

Browse files
authored
Merge pull request #124 from Dynamsoft/_dev
9.6.1
2 parents f51dd20 + 94b42ea commit 30254af

21 files changed

+124
-50
lines changed

Api Reference.url

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[InternetShortcut]
2-
URL=https://www.dynamsoft.com/barcode-reader/programming/javascript/api-reference/?ver=9.6.0
2+
URL=https://www.dynamsoft.com/barcode-reader/programming/javascript/api-reference/?ver=9.6.1

README.md

+28-28
Large diffs are not rendered by default.

dist/dbr-9.6.0.browser.worker.js renamed to dist/dbr-9.6.1.browser.worker.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
File renamed without changes.
Binary file not shown.
Binary file not shown.
File renamed without changes.
Binary file not shown.
File renamed without changes.

dist/dbr.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/dbr.mjs

+2-2
Large diffs are not rendered by default.

dist/dbr.pure.esm.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/dbr.pure.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/dbr.pure.mjs

+2-2
Large diffs are not rendered by default.

dist/types/class/barcodereader.d.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default class BarcodeReader {
2828
* ```
2929
* For convenience, you can set `license` in `script` tag instead.
3030
* ```html
31-
* <script src="https://cdn.jsdelivr.net/npm/[email protected].0/dist/dbr.js" data-license="PRODUCT-KEYS"></script>
31+
* <script src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/dbr.js" data-license="PRODUCT-KEYS"></script>
3232
* ```
3333
*/
3434
static set license(license: string);
@@ -83,7 +83,7 @@ export default class BarcodeReader {
8383
* If the auto-explored engine location is incorrect, you can manually specify the engine location.
8484
* The property needs to be set before [[loadWasm]].
8585
* ```js
86-
* Dynamsoft.DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].0/dist/";
86+
* Dynamsoft.DBR.BarcodeReader.engineResourcePath = "https://cdn.jsdelivr.net/npm/[email protected].1/dist/";
8787
* await Dynamsoft.DBR.BarcodeReader.loadWasm();
8888
* ```
8989
*/
@@ -230,7 +230,7 @@ export default class BarcodeReader {
230230
* The url of the default scanner UI.
231231
* Can only be changed before `createInstance`.
232232
* ```js
233-
* Dynamsoft.DBR.BarcodeScanner.defaultUIElementURL = "https://cdn.jsdelivr.net/npm/[email protected].0/dist/dbr.ui.html";
233+
* Dynamsoft.DBR.BarcodeScanner.defaultUIElementURL = "https://cdn.jsdelivr.net/npm/[email protected].1/dist/dbr.ui.html";
234234
* let pScanner = null;
235235
* (async()=>{
236236
* let scanner = await (pScanner = pScanner || Dynamsoft.DBR.BarcodeScanner.createInstance());

dist/types/class/barcodescanner.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ export default class BarcodeScanner extends BarcodeReader {
583583
/**
584584
* Bind UI, open the camera, start decoding, and remove the UIElement `display` style if the original style is `display:none;`.
585585
* ```js
586-
* await scanner.setUIElement("https://cdn.jsdelivr.net/npm/[email protected].0/dist/dbr.ui.html");
586+
* await scanner.setUIElement("https://cdn.jsdelivr.net/npm/[email protected].1/dist/dbr.ui.html");
587587
* scanner.onUniqueRead = (txt, result) => { alert(txt); console.log(result); };
588588
* await scanner.show();
589589
* // await scanner.hide();

legal.txt

+74
Original file line numberDiff line numberDiff line change
@@ -901,13 +901,87 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
901901
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
902902
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
903903
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
904+
===================================================================================
905+
904906
===================================================================================
905907
howler
906908

907909
Copyright (c) 2013-2020 James Simpson and GoldFire Studios, Inc.
908910
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
909911
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
910912
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
913+
===================================================================================
914+
915+
===================================================================================
916+
showdown
917+
918+
MIT License
919+
Copyright (c) 2018,2021 ShowdownJS
920+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
921+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
922+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
923+
===================================================================================
924+
925+
===================================================================================
926+
highlight.js
927+
928+
BSD 3-Clause License
929+
930+
Copyright (c) 2006, Ivan Sagalaev.
931+
All rights reserved.
932+
933+
Redistribution and use in source and binary forms, with or without
934+
modification, are permitted provided that the following conditions are met:
935+
936+
* Redistributions of source code must retain the above copyright notice, this
937+
list of conditions and the following disclaimer.
938+
939+
* Redistributions in binary form must reproduce the above copyright notice,
940+
this list of conditions and the following disclaimer in the documentation
941+
and/or other materials provided with the distribution.
942+
943+
* Neither the name of the copyright holder nor the names of its
944+
contributors may be used to endorse or promote products derived from
945+
this software without specific prior written permission.
946+
947+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
948+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
949+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
950+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
951+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
952+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
953+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
954+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
955+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
956+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
957+
===================================================================================
958+
959+
===================================================================================
960+
markdown-to-html-github-style(https://github.com/KrauseFx/markdown-to-html-github-style)
961+
962+
MIT License
963+
964+
Copyright (c) 2019 Felix Krause
965+
966+
Permission is hereby granted, free of charge, to any person obtaining a copy
967+
of this software and associated documentation files (the "Software"), to deal
968+
in the Software without restriction, including without limitation the rights
969+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
970+
copies of the Software, and to permit persons to whom the Software is
971+
furnished to do so, subject to the following conditions:
972+
973+
The above copyright notice and this permission notice shall be included in all
974+
copies or substantial portions of the Software.
975+
976+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
977+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
978+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
979+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
980+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
981+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
982+
SOFTWARE.
983+
===================================================================================
984+
911985
===================================================================================
912986
localForage
913987

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dynamsoft-javascript-barcode",
3-
"version": "9.6.0",
3+
"version": "9.6.1",
44
"description": "Dynamsoft Barcode Reader JS is a recognition SDK which enables you to embed barcode reading functionality in your web, desktop, and mobile applications. With a few lines of JavaScript code, you can develop a robust application to scan a linear barcode, QR Code, DaraMatrix, PDF417, and Aztec Code.",
55
"private": false,
66
"files": [
@@ -66,17 +66,17 @@
6666
"@rollup/plugin-typescript": "8.3.0",
6767
"@scannerproxy/browser-info": "^1.0.7",
6868
"@scannerproxy/curscript-path": "^1.0.3",
69-
"@scannerproxy/dlsjs": "^2.0.1",
69+
"@scannerproxy/dlsjs": "^2.0.2",
7070
"@types/node": "16.11.2",
7171
"@types/node-fetch": "2.6.1",
7272
"@types/node-localstorage": "1.3.0",
7373
"detect-browser-node-ssr": "^2.0.0",
7474
"fs-extra": "8.1.0",
75-
"inline-css": "^4.0.1",
76-
"markdown-styles": "^3.2.0",
75+
"highlight.js": "^9.15.6",
7776
"mutable-promise": "^1.1.13",
7877
"rollup": "2.58.0",
7978
"rollup-plugin-terser": "7.0.2",
79+
"showdown": "^1.9.0",
8080
"tslib": "2.3.1",
8181
"typedoc": "0.22.6",
8282
"typedoc-plugin-missing-exports": "0.22.3",

samples.url

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[InternetShortcut]
2-
URL=https://github.com/Dynamsoft/barcode-reader-javascript-samples/tree/v9.6.0
2+
URL=https://github.com/Dynamsoft/barcode-reader-javascript-samples/tree/v9.6.1

0 commit comments

Comments
 (0)