From bd7223eb9189deaabf21aa63f469eb5657c7eea4 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Sat, 1 Jun 2013 15:53:05 +0200 Subject: [PATCH 1/3] Sets version to 0.4-dev. --- README.md | 7 ++++++- package.json | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bbd1f84..fd3e05e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,12 @@ Uses [QR Code Generator](http://www.d-project.com/qrcode/index.html) (MIT). Kudo ## Changelog -### v0.3 - *2012-06-01* +### v0.4 - *2013-xx-xx* + +* + + +### v0.3 - *2013-06-01* * adds option to draw on existing canvas diff --git a/package.json b/package.json index 0e7d76b..097b93b 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "name": "jquery.qrcode", "displayName": "jQuery.qrcode", - "version": "0.3" + "version": "0.4-dev" } \ No newline at end of file From 2418a7bb9cd630e98844dce2242272466462ba54 Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 9 Jul 2013 15:12:11 +0200 Subject: [PATCH 2/3] Fixes missings default values in some cases. --- src/jquery.qrcode.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jquery.qrcode.js b/src/jquery.qrcode.js index 3440aa9..339bdda 100644 --- a/src/jquery.qrcode.js +++ b/src/jquery.qrcode.js @@ -149,9 +149,7 @@ return $div; }, - createHTML = function (options) { - - var settings = $.extend({}, defaults, options); + createHTML = function (settings) { return canvasAvailable && settings.render === 'canvas' ? createCanvas(settings) : createDiv(settings); }, @@ -188,12 +186,14 @@ // ------------------- $.fn.qrcode = function(options) { + var settings = $.extend({}, defaults, options); + return this.each(function () { if (this.nodeName.toLowerCase() === 'canvas') { - drawOnCanvas(this, options); + drawOnCanvas(this, settings); } else { - $(this).append(createHTML(options)); + $(this).append(createHTML(settings)); } }); }; From 820025e238d5cd7860779edc6809953714db43cd Mon Sep 17 00:00:00 2001 From: Lars Jung Date: Tue, 9 Jul 2013 15:17:16 +0200 Subject: [PATCH 3/3] Prepares release. --- README.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fd3e05e..3040b9a 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Uses [QR Code Generator](http://www.d-project.com/qrcode/index.html) (MIT). Kudo ## Changelog -### v0.4 - *2013-xx-xx* +### v0.4 - *2013-07-09* -* +* fixes missing default values in some cases ### v0.3 - *2013-06-01* diff --git a/package.json b/package.json index 097b93b..fa553e4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "name": "jquery.qrcode", "displayName": "jQuery.qrcode", - "version": "0.4-dev" + "version": "0.4" } \ No newline at end of file