From 54ba0fdd12626540c5f47642a1b0daa1ddfe056a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Sandstr=C3=B6m?= Date: Fri, 30 Dec 2016 09:07:59 +0100 Subject: [PATCH 1/2] Update and rename README to README.md --- README => README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename README => README.md (84%) diff --git a/README b/README.md similarity index 84% rename from README rename to README.md index bf5dd799..e15a9433 100644 --- a/README +++ b/README.md @@ -9,6 +9,7 @@ Usage: Include the scripts in the following order: +```html @@ -26,11 +27,12 @@ Include the scripts in the following order: +``` -Set qrcode.callback to function "func(data)", where data will get the decoded information. +Set `qrcode.callback` to `function func(data) { }`, where data will get the decoded information. -Decode image with: qrcode.decode(url or DataURL). -Decode from canvas with "qr-canvas" ID: qrcode.decode() +Decode image with: `qrcode.decode(url or DataURL)` +Decode from canvas with `qr-canvas` ID: `qrcode.decode()` [new from 2014.01.09] For webcam qrcode decoding (included in the test.html) you will need a browser with getUserMedia (WebRTC) capability. From 79c05a7f6ad7869aad09a107b13ff2439c4cbc6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Sandstr=C3=B6m?= Date: Fri, 30 Dec 2016 11:32:35 +0100 Subject: [PATCH 2/2] Comment out (and prettify) processing time --- src/qrcode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qrcode.js b/src/qrcode.js index 69f52aa7..8d7f2890 100644 --- a/src/qrcode.js +++ b/src/qrcode.js @@ -178,7 +178,7 @@ qrcode.process = function(ctx){ var end = new Date().getTime(); var time = end - start; - console.log(time); + //console.log("Decoding took " + time + "ms"); return qrcode.decode_utf8(str); //alert("Time:" + time + " Code: "+str);