Merge pull request #1 from yugasun/master

fetch upsteam
4 years ago · 78c42b3913
parent e15862b123 be1f6a980b
commit 78c42b3913
7 changed files with 22 additions and 10525 deletions
--- a/README.md
+++ b/README.md
@ -1,7 +1,8 @@
 # [qrcode-decoder](https://github.com/yugasun/qrcode-decoder)

-[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/yugasun/qrcode-decoder/blob/master/LICENSE)
+[![npm](https://img.shields.io/npm/v/qrcode-decoder)](http://www.npmtrends.com/qrcode-decoder)
 [![NPM downloads](http://img.shields.io/npm/dm/qrcode-decoder.svg?style=flat-square)](http://www.npmtrends.com/qrcode-decoder)
+[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/yugasun/qrcode-decoder/blob/master/LICENSE)

 [简体中文](./README.zh-CN.md) | English

--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@ -1,7 +1,8 @@
 # [qrcode-decoder](https://github.com/yugasun/qrcode-decoder)

-[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/yugasun/qrcode-decoder/blob/master/LICENSE)
+[![npm](https://img.shields.io/npm/v/qrcode-decoder)](http://www.npmtrends.com/qrcode-decoder)
 [![NPM downloads](http://img.shields.io/npm/dm/qrcode-decoder.svg?style=flat-square)](http://www.npmtrends.com/qrcode-decoder)
+[![license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/yugasun/qrcode-decoder/blob/master/LICENSE)

 简体中文 | [English](./README.md)

--- a/demo/image.html
+++ b/demo/image.html
@ -9,22 +9,25 @@
  <body>
    <section>
      <h3>Same domain image</h3>
-      <img src="./assets/qrcode.png" alt="qr code" /><br />
+      <img id="img1" src="./assets/qrcode.png" alt="qr code" /><br />
      <button id="decode1">Decode!</button><br />
      <span id="result1"></span><br />
    </section>
    <hr />
    <section>
      <h3>Different domain image</h3>
+      <input
+        id="img2"
+        value="https://yugasun.com/static/wechat.jpg"
+        style="width: 400px"
+      /><br />
      <button id="decode2">Decode!</button><br />
      <span id="result2"></span><br />
    </section>
    <script src="./lib/vconsole.min.js"></script>
    <script src="./index.min.js"></script>
-    <script src="./index.min.js"></script>
    <script type="module">
      var vConsole = new VConsole();
-      console.log('Hello world');
      function main() {
        var qr = new QrcodeDecoder();

@ -32,12 +35,13 @@
        var btn2 = document.querySelector('button#decode2');
        var result1 = document.querySelector('#result1');
        var result2 = document.querySelector('#result2');
-        var img = document.querySelector('img');
+        var img1 = document.querySelector('#img1');
+        var img2 = document.querySelector('#img2');

        btn1.onclick = async () => {
          // you can also decode from image path
          // const code = await qr.decodeFromImage('./assets/qrcode.png');
-          const code = await qr.decodeFromImage(img);
+          const code = await qr.decodeFromImage(img1);
          console.log(code);
          result1.innerText = code.data;
        };
@ -45,17 +49,16 @@
        btn2.onclick = async () => {
          // you can also decode from image path
          // const code = await qr.decodeFromImage('./assets/qrcode.png');
-          const code = await qr.decodeFromImage(
-            'https://yugasun.com/static/wechat.jpg',
-            {
-              crossOrigin: 'anonymous',
-            },
-          );
+          const code = await qr.decodeFromImage(img2.value, {
+            crossOrigin: 'anonymous',
+          });
          console.log(code);
          result2.innerText = code.data;
        };
      }
-      main();
+      window.onload = () => {
+        main();
+      };
    </script>
  </body>
 </html>
--- a/demo/index.min.js
+++ b/demo/index.min.js
--- a/src/index.ts
+++ b/src/index.ts
@ -221,10 +221,10 @@ class QrcodeDecoder {
      imgDom = img;
    } else if (typeof img === 'string') {
      imgDom = document.createElement('img');
-      imgDom.src = img;
      if (options.crossOrigin) {
        imgDom.crossOrigin = options.crossOrigin;
      }
+      imgDom.src = img;
      const proms = () =>
        new Promise((resolve) => {
          imgDom!.onload = () => resolve(true);
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "dist",
-    "baseUrl": ".",
-    "downlevelIteration": true,
-    "emitDecoratorMetadata": true,
-    "esModuleInterop": true,
-    "experimentalDecorators": true,
-    "preserveConstEnums": true,
-    "importHelpers": false,
-    "target": "es5",
-    "module": "commonjs",
-    "lib": ["es5", "es6", "dom"],
-    "moduleResolution": "node",
-    "sourceMap": false,
-    "paths": {
-      "*": ["typings/*", "includes/*"]
-    },
-    "resolveJsonModule": true,
-    "noUnusedLocals": true,
-    "strict": true
-  }
-}
--- a/tsconfig.json
+++ b/tsconfig.json
@ -1,5 +1,6 @@
 {
  "compilerOptions": {
+    "outDir": "dist",
    "baseUrl": ".",
    "composite": true,
    "declaration": true,
@ -14,9 +15,6 @@
    "module": "ESNext",
    "moduleResolution": "node",
    "sourceMap": false,
-    "paths": {
-      "*": ["typings/*", "includes/*"]
-    },
    "resolveJsonModule": true,
    "noUnusedLocals": true,
    "strict": true,