diff --git a/README.md b/README.md index bbd1f84..3040b9a 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-07-09* + +* fixes missing default values in some cases + + +### v0.3 - *2013-06-01* * adds option to draw on existing canvas diff --git a/package.json b/package.json index 0e7d76b..fa553e4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "name": "jquery.qrcode", "displayName": "jQuery.qrcode", - "version": "0.3" + "version": "0.4" } \ No newline at end of file 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)); } }); };