UnknownObject/qrcode-decoder
1
0
Fork 0
mirror of https://github.com/yugasun/qrcode-decoder.git synced 2026-08-13 21:12:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: UnknownObject/qrcode-decoder:v0.1.3
Branches Tags
UnknownObject/qrcode-decoder:master UnknownObject/qrcode-decoder:gh-pages
UnknownObject/qrcode-decoder:v0.3.4 UnknownObject/qrcode-decoder:v0.3.3 UnknownObject/qrcode-decoder:v0.3.2 UnknownObject/qrcode-decoder:0.3.1 UnknownObject/qrcode-decoder:v0.3.1 UnknownObject/qrcode-decoder:v0.3.0 UnknownObject/qrcode-decoder:v0.2.2 UnknownObject/qrcode-decoder:0.2.0 UnknownObject/qrcode-decoder:0.1.3 UnknownObject/qrcode-decoder:v0.1.3 UnknownObject/qrcode-decoder:0.1.2 UnknownObject/qrcode-decoder:v0.1.1
...
compare: UnknownObject/qrcode-decoder:0.2.0
Branches Tags
UnknownObject/qrcode-decoder:gh-pages UnknownObject/qrcode-decoder:master
UnknownObject/qrcode-decoder:v0.3.4 UnknownObject/qrcode-decoder:v0.3.3 UnknownObject/qrcode-decoder:v0.3.2 UnknownObject/qrcode-decoder:0.3.1 UnknownObject/qrcode-decoder:v0.3.1 UnknownObject/qrcode-decoder:v0.3.0 UnknownObject/qrcode-decoder:v0.2.2 UnknownObject/qrcode-decoder:0.2.0 UnknownObject/qrcode-decoder:0.1.3 UnknownObject/qrcode-decoder:v0.1.3 UnknownObject/qrcode-decoder:0.1.2 UnknownObject/qrcode-decoder:v0.1.1
7 Commits
v0.1.3 ... 0.2.0
Author SHA1 Message Date
yugasun 44737ddfe7 0.2.0 2021-05-19 10:46:47 +08:00
yugasun 032f9ba16a chore: update deploy to pages 2021-05-19 10:41:53 +08:00
yugasun d1a5b9de6b chore: update demo 2021-05-19 10:40:00 +08:00
yugasun fd6daa86a1 chore: fix deps 2021-05-12 20:52:14 +08:00
yugasun b8d25e8969 docs: update readme 2021-05-12 20:29:45 +08:00
yugasun 455b0deb25 0.1.3 2021-05-12 20:26:35 +08:00
yugasun d77b666da2 fix: crossOrigin on IOS, close #14 2021-05-12 20:26:14 +08:00
6 changed files with 26 additions and 20 deletions
Expand all files Collapse all files
README.md
+2 -1
View File
@@ -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
README.zh-CN.md
+2 -1
View File
@@ -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)
demo/image.html
+13 -10
View File
@@ -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>
demo/index.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
package.json
+5 -4
View File
@@ -1,6 +1,6 @@
{ {
"name": "qrcode-decoder", "name": "qrcode-decoder",
"version": "0.1.3", "version": "0.2.0",
"description": "Tool for decoding qrcode", "description": "Tool for decoding qrcode",
"main": "dist/index.js", "main": "dist/index.js",
"sideEffects": false, "sideEffects": false,
@@ -12,7 +12,7 @@
"codecov": "jest --coverage && codecov", "codecov": "jest --coverage && codecov",
"copy-file": "cp dist/index.min.js demo/", "copy-file": "cp dist/index.min.js demo/",
"release": "git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags", "release": "git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags",
"deploy": "gh-pages -d demo --remote origin" "pages": "gh-pages -d demo --remote origin"
}, },
"husky": { "husky": {
"hooks": { "hooks": {
@@ -54,11 +54,12 @@
"codecov": "^3.8.1", "codecov": "^3.8.1",
"cross-env": "^6.0.3", "cross-env": "^6.0.3",
"fancy-log": "^1.3.3", "fancy-log": "^1.3.3",
"gh-pages": "^3.1.0",
"husky": "^3.0.9", "husky": "^3.0.9",
"jest": "^24.9.0", "jest": "^24.9.0",
"lint-staged": "^9.5.0", "lint-staged": "^9.5.0",
"prettier": "^1.18.2", "prettier": "^1.18.2",
"rolllup": "^2.38.1", "rollup": "^2.38.1",
"rollup-plugin-commonjs": "^8.3.0", "rollup-plugin-commonjs": "^8.3.0",
"rollup-plugin-json": "^3.1.0", "rollup-plugin-json": "^3.1.0",
"rollup-plugin-node-builtins": "^2.1.2", "rollup-plugin-node-builtins": "^2.1.2",
@@ -86,6 +87,6 @@
}, },
"homepage": "https://github.com/yugasun/qrcode-decoder#readme", "homepage": "https://github.com/yugasun/qrcode-decoder#readme",
"dependencies": { "dependencies": {
"jsqr": "^1.3.1" "jsqr": "^1.4.0"
} }
} }
src/index.ts
+1 -1
View File
@@ -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);