Merge pull request #1 from yugasun/master

fetch upsteam
pull/16/head
Lőrik Levente 4 years ago committed by GitHub
commit 78c42b3913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,7 +1,8 @@
# [qrcode-decoder](https://github.com/yugasun/qrcode-decoder) # [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) [![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 [简体中文](./README.zh-CN.md) | English

@ -1,7 +1,8 @@
# [qrcode-decoder](https://github.com/yugasun/qrcode-decoder) # [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) [![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) 简体中文 | [English](./README.md)

@ -9,22 +9,25 @@
<body> <body>
<section> <section>
<h3>Same domain image</h3> <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 /> <button id="decode1">Decode!</button><br />
<span id="result1"></span><br /> <span id="result1"></span><br />
</section> </section>
<hr /> <hr />
<section> <section>
<h3>Different domain image</h3> <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 /> <button id="decode2">Decode!</button><br />
<span id="result2"></span><br /> <span id="result2"></span><br />
</section> </section>
<script src="./lib/vconsole.min.js"></script> <script src="./lib/vconsole.min.js"></script>
<script src="./index.min.js"></script> <script src="./index.min.js"></script>
<script src="./index.min.js"></script>
<script type="module"> <script type="module">
var vConsole = new VConsole(); var vConsole = new VConsole();
console.log('Hello world');
function main() { function main() {
var qr = new QrcodeDecoder(); var qr = new QrcodeDecoder();
@ -32,12 +35,13 @@
var btn2 = document.querySelector('button#decode2'); var btn2 = document.querySelector('button#decode2');
var result1 = document.querySelector('#result1'); var result1 = document.querySelector('#result1');
var result2 = document.querySelector('#result2'); var result2 = document.querySelector('#result2');
var img = document.querySelector('img'); var img1 = document.querySelector('#img1');
var img2 = document.querySelector('#img2');
btn1.onclick = async () => { btn1.onclick = async () => {
// you can also decode from image path // you can also decode from image path
// const code = await qr.decodeFromImage('./assets/qrcode.png'); // const code = await qr.decodeFromImage('./assets/qrcode.png');
const code = await qr.decodeFromImage(img); const code = await qr.decodeFromImage(img1);
console.log(code); console.log(code);
result1.innerText = code.data; result1.innerText = code.data;
}; };
@ -45,17 +49,16 @@
btn2.onclick = async () => { btn2.onclick = async () => {
// you can also decode from image path // you can also decode from image path
// const code = await qr.decodeFromImage('./assets/qrcode.png'); // const code = await qr.decodeFromImage('./assets/qrcode.png');
const code = await qr.decodeFromImage( const code = await qr.decodeFromImage(img2.value, {
'https://yugasun.com/static/wechat.jpg',
{
crossOrigin: 'anonymous', crossOrigin: 'anonymous',
}, });
);
console.log(code); console.log(code);
result2.innerText = code.data; result2.innerText = code.data;
}; };
} }
window.onload = () => {
main(); main();
};
</script> </script>
</body> </body>
</html> </html>

10484
demo/index.min.js vendored

File diff suppressed because one or more lines are too long

@ -221,10 +221,10 @@ class QrcodeDecoder {
imgDom = img; imgDom = img;
} else if (typeof img === 'string') { } else if (typeof img === 'string') {
imgDom = document.createElement('img'); imgDom = document.createElement('img');
imgDom.src = img;
if (options.crossOrigin) { if (options.crossOrigin) {
imgDom.crossOrigin = options.crossOrigin; imgDom.crossOrigin = options.crossOrigin;
} }
imgDom.src = img;
const proms = () => const proms = () =>
new Promise((resolve) => { new Promise((resolve) => {
imgDom!.onload = () => resolve(true); imgDom!.onload = () => resolve(true);

@ -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
}
}

@ -1,5 +1,6 @@
{ {
"compilerOptions": { "compilerOptions": {
"outDir": "dist",
"baseUrl": ".", "baseUrl": ".",
"composite": true, "composite": true,
"declaration": true, "declaration": true,
@ -14,9 +15,6 @@
"module": "ESNext", "module": "ESNext",
"moduleResolution": "node", "moduleResolution": "node",
"sourceMap": false, "sourceMap": false,
"paths": {
"*": ["typings/*", "includes/*"]
},
"resolveJsonModule": true, "resolveJsonModule": true,
"noUnusedLocals": true, "noUnusedLocals": true,
"strict": true, "strict": true,

Loading…
Cancel
Save