Fixes missings default values in some cases.

pull/1/head
Lars Jung 12 years ago
parent bd7223eb91
commit 2418a7bb9c

@ -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));
} }
}); });
}; };

Loading…
Cancel
Save