0.1.2

6 years ago · 8c3144caf2
parent 8f15498b05
commit 8c3144caf2
4 changed files with 33 additions and 9 deletions
--- a/demo/image.html
+++ b/demo/image.html
@ -5,24 +5,45 @@
        <title>QrcodeDecoder - Image</title>
    </head>
    <body>
-        <button id="decode">Decode!</button><br>
-        <span id="result"></span><br>
-        <img src="./assets/qrcode.png" alt="qr code" />
+        <section>
+            <h3>Same domain image</h3>
+            <img 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>
+            <button id="decode2">Decode!</button><br>
+            <span id="result2"></span><br>
+        </section>
        <script src="./index.aio.min.js"></script>
        <script type="module">
            function main() {
                var qr = new QrcodeDecoder();

-                var btn = document.querySelector('button#decode');
+                var btn1 = document.querySelector('button#decode1');
+                var btn2 = document.querySelector('button#decode2');
+                var result1 = document.querySelector('#result1');
+                var result2 = document.querySelector('#result2');
                var img = document.querySelector('img');
-                var result = document.querySelector('#result');

-                btn.onclick = async () => {
+                btn1.onclick = async () => {
                    // you can also decode from image path
                    // const code = await qr.decodeFromImage('./assets/qrcode.png');
                    const code = await qr.decodeFromImage(img);
                    console.log(code);
-                    result.innerText = code.data;
+                    result1.innerText = code.data;
+                };
+
+                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',
+                    });
+                    console.log(code);
+                    result2.innerText = code.data;
                };
            }
            main();
--- a/demo/index.aio.min.js
+++ b/demo/index.aio.min.js
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "qrcode-decoder",
-  "version": "0.1.1",
+  "version": "0.1.2",
  "description": "Tool for decoding qrcode",
  "main": "dist/index.js",
  "jsnext:main": "dist/index.esm.js",
--- a/src/index.js
+++ b/src/index.js
@ -259,6 +259,9 @@ class QrcodeDecoder {
        } else if (typeof img === 'string') {
            imgDom = document.createElement('img');
            imgDom.src = img;
+            if (options.crossOrigin) {
+                imgDom.crossOrigin = options.crossOrigin;
+            }
            const proms = () => new Promise((resolve) => {
                imgDom.onload = () => resolve(true);
            });