Skip to content

Commit 060a13b

Browse files
11.4.3000
1 parent a4530da commit 060a13b

7 files changed

Lines changed: 0 additions & 124 deletions

File tree

README.html

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,7 @@ <h3 id="understand-the-code">Understand the code</h3>
247247
<span class="hljs-tag">&lt;<span class="hljs-name">body</span>&gt;</span>
248248
<span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">id</span>=<span class="hljs-string">&quot;camera-view-container&quot;</span> <span class="hljs-attr">style</span>=<span class="hljs-string">&quot;width: 100%; height: 60vh&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>
249249
<span class="hljs-tag">&lt;<span class="hljs-name">textarea</span> <span class="hljs-attr">id</span>=<span class="hljs-string">&quot;results&quot;</span> <span class="hljs-attr">style</span>=<span class="hljs-string">&quot;width: 100%; min-height: 10vh; font-size: 3vmin; overflow: auto&quot;</span> <span class="hljs-attr">disabled</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">textarea</span>&gt;</span>
250-
<<<<<<< HEAD
251-
<span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
252-
=======
253250
<span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
254-
>>>>>>> _dev
255251
<span class="hljs-tag">&lt;<span class="hljs-name">script</span>&gt;</span><span class="javascript">
256252
Dynamsoft.License.LicenseManager.initLicense(<span class="hljs-string">&quot;DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9&quot;</span>);
257253
Dynamsoft.Core.CoreModule.loadWasm();
@@ -359,41 +355,24 @@ <h3 id="step-1-include-the-sdk">Step 1: Include the SDK</h3>
359355
<ul>
360356
<li>jsDelivr</li>
361357
</ul>
362-
<<<<<<< HEAD
363-
<pre><code class="hljs html language-html"> <span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
364-
=======
365358
<pre><code class="hljs html language-html"> <span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
366-
>>>>>>> _dev
367359
</code></pre>
368360
<ul>
369361
<li>UNPKG</li>
370362
</ul>
371-
<<<<<<< HEAD
372-
<pre><code class="hljs html language-html"> <span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;https://unpkg.com/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
373-
</code></pre>
374-
<!-- - In some rare cases (such as some restricted areas), you might not be able to access the CDN. If this happens, you can use the following files for the test.
375-
<pre><code class="hljs html language-html"> <span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;https://download2.dynamsoft.com/packages/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
376-
=======
377363
<pre><code class="hljs html language-html"> <span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;https://unpkg.com/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
378364
</code></pre>
379365
<!-- - In some rare cases (such as some restricted areas), you might not be able to access the CDN. If this happens, you can use the following files for the test.
380366
<pre><code class="hljs html language-html"> <span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;https://download2.dynamsoft.com/packages/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
381-
>>>>>>> _dev
382367
</code></pre>
383368
384369
However, please **DO NOT** use `download2.dynamsoft.com` resources in a production application as they are for temporary testing purposes only. Instead, you can try hosting the SDK yourself. -->
385370
<ul>
386371
<li>In frameworks like React, Vue and Angular, you may want to add the package as a dependency.</li>
387372
</ul>
388-
<<<<<<< HEAD
389-
<pre><code class="hljs sh language-sh"> npm i dynamsoft-barcode-reader-bundle@11.4.2001 -E
390-
<span class="hljs-comment"># or</span>
391-
yarn add dynamsoft-barcode-reader-bundle@11.4.2001 -E
392-
=======
393373
<pre><code class="hljs sh language-sh"> npm i dynamsoft-barcode-reader-bundle@11.4.3000 -E
394374
<span class="hljs-comment"># or</span>
395375
yarn add dynamsoft-barcode-reader-bundle@11.4.3000 -E
396-
>>>>>>> _dev
397376
</code></pre>
398377
<p>NOTE that in frameworks, you need to <a href="#2-optional-specify-the-location-of-the-engine-files">specify the location of the engine files</a>.</p>
399378
<div class="multi-panel-end"></div>
@@ -406,22 +385,14 @@ <h3 id="step-1-include-the-sdk">Step 1: Include the SDK</h3>
406385
<p>The resources are located at path <code>dynamsoft-barcode-reader-js-{version-number}/dist/</code>.</p></li>
407386
<li><p>From npm</p></li>
408387
</ul>
409-
<<<<<<< HEAD
410-
<pre><code class="hljs sh language-sh"> npm i dynamsoft-barcode-reader-bundle@11.4.2001 -E
411-
=======
412388
<pre><code class="hljs sh language-sh"> npm i dynamsoft-barcode-reader-bundle@11.4.3000 -E
413-
>>>>>>> _dev
414389
</code></pre>
415390
<p>The resources are located at the path <code>node_modules/&lt;pkg&gt;</code>, without <code>@&lt;version&gt;</code>. You must copy "dynamsoft-xxx" packages elsewhere and add <code>@&lt;version&gt;</code>. The <code>&lt;version&gt;</code> can be obtained from <code>package.json</code> of each package. Another thing to do is to <a href="#2-optional-specify-the-location-of-the-engine-files">specify the engineResourcePaths</a> so that the SDK can correctly locate the resources.</p>
416391
<blockquote>
417392
<p>Since "node<em>modules" is reserved for Node.js dependencies, and in our case the package is used only as static resources, we recommend either renaming the "node</em>modules" folder or moving the "dynamsoft-" packages to a dedicated folder for static resources in your project to facilitate self-hosting.</p>
418393
</blockquote>
419394
<p>You can typically include SDK like this:</p>
420-
<<<<<<< HEAD
421-
<pre><code class="hljs html language-html"><span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;path/to/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
422-
=======
423395
<pre><code class="hljs html language-html"><span class="hljs-tag">&lt;<span class="hljs-name">script</span> <span class="hljs-attr">src</span>=<span class="hljs-string">&quot;path/to/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js&quot;</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">script</span>&gt;</span>
424-
>>>>>>> _dev
425396
</code></pre>
426397
<div class="multi-panel-end"></div>
427398
<div class="multi-panel-switching-end"></div>
@@ -687,11 +658,7 @@ <h4 id="14-specify-a-scan-region">1.4. Specify a scan region</h4>
687658
<h3 id="2-edit-the-preset-templates-directly">2. Edit the preset templates directly</h3>
688659
<p>The preset templates have many more settings that can be customized to suit your use case best. If you <a href="https://www.dynamsoft.com/barcode-reader/downloads/1000003-confirmation/">download the SDK from Dynamsoft website</a>, you can find the templates under</p>
689660
<ul>
690-
<<<<<<< HEAD
691-
<li>"/dynamsoft-barcode-reader-js-11.4.2001/dist/templates/"</li>
692-
=======
693661
<li>"/dynamsoft-barcode-reader-js-11.4.3000/dist/templates/"</li>
694-
>>>>>>> _dev
695662
</ul>
696663
<p>Upon completing the template editing, you can invoke the <code>initSettings</code> method and provide it with the template path as an argument.</p>
697664
<pre><code class="hljs javascript language-javascript"><span class="hljs-keyword">await</span> cvRouter.initSettings(<span class="hljs-string">&quot;PATH-TO-THE-FILE&quot;</span>); <span class="hljs-comment">// E.g. &quot;https://your-website/ReadSingleBarcode.json&quot;)</span>
@@ -765,11 +732,7 @@ <h2 id="customizing-the-ui">Customizing the UI</h2>
765732
<h2 id="documentation">Documentation</h2>
766733
<h3 id="api-reference">API Reference</h3>
767734
<p>You can check out the detailed documentation about the APIs of the SDK at<br />
768-
<<<<<<< HEAD
769-
<a href="https://www.dynamsoft.com/barcode-reader/docs/web/programming/javascript/api-reference/?ver=11.4.2001">https://www.dynamsoft.com/barcode-reader/docs/web/programming/javascript/api-reference/?ver=11.4.2001</a>.</p>
770-
=======
771735
<a href="https://www.dynamsoft.com/barcode-reader/docs/web/programming/javascript/api-reference/?ver=11.4.3000">https://www.dynamsoft.com/barcode-reader/docs/web/programming/javascript/api-reference/?ver=11.4.3000</a>.</p>
772-
>>>>>>> _dev
773736
<!-- Compatibility is basically not an issue. Pls remove to another place
774737
775738
## System Requirements

README.md

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ The complete code of the "Hello World" example is shown below
3434
<body>
3535
<div id="camera-view-container" style="width: 100%; height: 60vh"></div>
3636
<textarea id="results" style="width: 100%; min-height: 10vh; font-size: 3vmin; overflow: auto" disabled></textarea>
37-
<<<<<<< HEAD
38-
<script src="https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js"></script>
39-
=======
4037
<script src="https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js"></script>
41-
>>>>>>> _dev
4238
<script>
4339
Dynamsoft.License.LicenseManager.initLicense("DLS2eyJvcmdhbml6YXRpb25JRCI6IjIwMDAwMSJ9");
4440
Dynamsoft.Core.CoreModule.loadWasm();
@@ -160,47 +156,29 @@ The simplest way to include the SDK is to use either the [jsDelivr](https://jsde
160156
- jsDelivr
161157
162158
```html
163-
<<<<<<< HEAD
164-
<script src="https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js"></script>
165-
=======
166159
<script src="https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js"></script>
167-
>>>>>>> _dev
168160
```
169161
170162
- UNPKG
171163
172164
```html
173-
<<<<<<< HEAD
174-
<script src="https://unpkg.com/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js"></script>
175-
=======
176165
<script src="https://unpkg.com/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js"></script>
177-
>>>>>>> _dev
178166
```
179167
180168
<!-- - In some rare cases (such as some restricted areas), you might not be able to access the CDN. If this happens, you can use the following files for the test.
181169
182170
```html
183-
<<<<<<< HEAD
184-
<script src="https://download2.dynamsoft.com/packages/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js"></script>
185-
=======
186171
<script src="https://download2.dynamsoft.com/packages/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js"></script>
187-
>>>>>>> _dev
188172
```
189173
190174
However, please **DO NOT** use `download2.dynamsoft.com` resources in a production application as they are for temporary testing purposes only. Instead, you can try hosting the SDK yourself. -->
191175
192176
- In frameworks like React, Vue and Angular, you may want to add the package as a dependency.
193177
194178
```sh
195-
<<<<<<< HEAD
196-
npm i dynamsoft-barcode-reader-bundle@11.4.2001 -E
197-
# or
198-
yarn add dynamsoft-barcode-reader-bundle@11.4.2001 -E
199-
=======
200179
npm i dynamsoft-barcode-reader-bundle@11.4.3000 -E
201180
# or
202181
yarn add dynamsoft-barcode-reader-bundle@11.4.3000 -E
203-
>>>>>>> _dev
204182
```
205183
206184
NOTE that in frameworks, you need to [specify the location of the engine files](#2-optional-specify-the-location-of-the-engine-files).
@@ -220,11 +198,7 @@ Besides using the public CDN, you can also download the SDK and host its files o
220198
- From npm
221199
222200
```sh
223-
<<<<<<< HEAD
224-
npm i dynamsoft-barcode-reader-bundle@11.4.2001 -E
225-
=======
226201
npm i dynamsoft-barcode-reader-bundle@11.4.3000 -E
227-
>>>>>>> _dev
228202
```
229203
230204
The resources are located at the path `node_modules/<pkg>`, without `@<version>`. You must copy "dynamsoft-xxx" packages elsewhere and add `@<version>`. The `<version>` can be obtained from `package.json` of each package. Another thing to do is to [specify the engineResourcePaths](#2-optional-specify-the-location-of-the-engine-files) so that the SDK can correctly locate the resources.
@@ -233,11 +207,7 @@ Besides using the public CDN, you can also download the SDK and host its files o
233207
You can typically include SDK like this:
234208
235209
```html
236-
<<<<<<< HEAD
237-
<script src="path/to/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js"></script>
238-
=======
239210
<script src="path/to/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js"></script>
240-
>>>>>>> _dev
241211
```
242212
<div class="multi-panel-end"></div>
243213
@@ -556,11 +526,7 @@ await cvRouter.startCapturing("ReadSingleBarcode");
556526
557527
The preset templates have many more settings that can be customized to suit your use case best. If you [download the SDK from Dynamsoft website](https://www.dynamsoft.com/barcode-reader/downloads/1000003-confirmation/), you can find the templates under
558528
559-
<<<<<<< HEAD
560-
* "/dynamsoft-barcode-reader-js-11.4.2001/dist/templates/"
561-
=======
562529
* "/dynamsoft-barcode-reader-js-11.4.3000/dist/templates/"
563-
>>>>>>> _dev
564530
565531
Upon completing the template editing, you can invoke the `initSettings` method and provide it with the template path as an argument.
566532
@@ -662,11 +628,7 @@ The UI is part of the auxiliary SDK "Dynamsoft Camera Enhancer", read more on ho
662628
### API Reference
663629
664630
You can check out the detailed documentation about the APIs of the SDK at
665-
<<<<<<< HEAD
666-
[https://www.dynamsoft.com/barcode-reader/docs/web/programming/javascript/api-reference/?ver=11.4.2001](https://www.dynamsoft.com/barcode-reader/docs/web/programming/javascript/api-reference/?ver=11.4.2001).
667-
=======
668631
[https://www.dynamsoft.com/barcode-reader/docs/web/programming/javascript/api-reference/?ver=11.4.3000](https://www.dynamsoft.com/barcode-reader/docs/web/programming/javascript/api-reference/?ver=11.4.3000).
669-
>>>>>>> _dev
670632
671633
<!-- Compatibility is basically not an issue. Pls remove to another place
672634

dist/dbr.bundle.esm.js

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/dbr.bundle.js

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/dbr.bundle.mjs

Lines changed: 0 additions & 8 deletions
Large diffs are not rendered by default.

dist/dbr.bundle.worker.js

Lines changed: 0 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"name": "dynamsoft-barcode-reader-bundle",
3-
<<<<<<< HEAD
4-
"version": "11.4.2001",
5-
=======
63
"version": "11.4.3000",
7-
>>>>>>> _dev
84
"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.",
95
"main": "dist/dbr.bundle.js",
106
"module": "dist/dbr.bundle.esm.js",
@@ -80,21 +76,12 @@
8076
"@babel/core": "^7.24.0",
8177
"@babel/preset-env": "^7.24.0",
8278
"@dynamsoft/dm-camera": "5.0.0-dev-20260424104800",
83-
<<<<<<< HEAD
84-
"@dynamsoft/dynamsoft-barcode-reader": "11.4.20-dev-20260417175846",
85-
"@dynamsoft/dynamsoft-capture-vision-router": "3.4.20-dev-20260423155104",
86-
"@dynamsoft/dynamsoft-code-parser": "3.4.20-dev-20260415104120",
87-
"@dynamsoft/dynamsoft-license": "4.4.20-dev-20260415104056",
88-
"@dynamsoft/dynamsoft-utility": "2.4.20-dev-20260415104100",
89-
"@dynamsoft/rd2-scripts": "0.1.52",
90-
=======
9179
"@dynamsoft/dynamsoft-barcode-reader": "11.4.30-dev-20260629163107",
9280
"@dynamsoft/dynamsoft-capture-vision-router": "3.4.30-dev-20260629163033",
9381
"@dynamsoft/dynamsoft-code-parser": "3.4.30-dev-20260629163135",
9482
"@dynamsoft/dynamsoft-license": "4.4.30-dev-20260629163040",
9583
"@dynamsoft/dynamsoft-utility": "2.4.30-dev-20260629163047",
9684
"@dynamsoft/rd2-scripts": "^0.1.56",
97-
>>>>>>> _dev
9885
"@rollup/plugin-babel": "^6.0.4",
9986
"@rollup/plugin-node-resolve": "^15.2.3",
10087
"@rollup/plugin-replace": "^5.0.5",
@@ -103,11 +90,7 @@
10390
"@scannerproxy/curscript-path": "^2.0.6",
10491
"@scannerproxy/dlsjs": "3.0.39",
10592
"@types/node": "^22.15.3",
106-
<<<<<<< HEAD
107-
"dynamsoft-core": "npm:@dynamsoft/dynamsoft-core@4.4.20-dev-20260415104041",
108-
=======
10993
"dynamsoft-core": "npm:@dynamsoft/dynamsoft-core@4.4.30-dev-20260629163026",
110-
>>>>>>> _dev
11194
"mutable-promise": "^1.1.15",
11295
"rollup": "^3.29.3",
11396
"rollup-plugin-dts": "^6.1.0",

0 commit comments

Comments
 (0)