UnknownObject/jquery-qrcode
1
0
Fork 0
mirror of https://github.com/lrsjng/jquery-qrcode.git synced 2026-08-12 20:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes missings default values in some cases.

Browse Source
This commit is contained in:
Lars Jung
2013-07-09 15:12:11 +02:00
parent bd7223eb91
commit 2418a7bb9c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/jquery.qrcode.js
+5 -5
View File
@@ -149,9 +149,7 @@
return $div; return $div;
}, },
createHTML = function (options) { createHTML = function (settings) {
var settings = $.extend({}, defaults, options);
return canvasAvailable && settings.render === 'canvas' ? createCanvas(settings) : createDiv(settings); return canvasAvailable && settings.render === 'canvas' ? createCanvas(settings) : createDiv(settings);
}, },
@@ -188,12 +186,14 @@
// ------------------- // -------------------
$.fn.qrcode = function(options) { $.fn.qrcode = function(options) {
var settings = $.extend({}, defaults, options);
return this.each(function () { return this.each(function () {
if (this.nodeName.toLowerCase() === 'canvas') { if (this.nodeName.toLowerCase() === 'canvas') {
drawOnCanvas(this, options); drawOnCanvas(this, settings);
} else { } else {
$(this).append(createHTML(options)); $(this).append(createHTML(settings));
} }
}); });
}; };