Maintenance.

pull/18/head v0.11.0
Lars Jung 11 years ago
parent 672549f4ac
commit e8f252f6e1

@ -17,6 +17,11 @@ indent_style = space
indent_size = 2
[bower.json]
indent_style = space
indent_size = 2
[.travis.yml]
indent_style = space
indent_size = 2

@ -1,6 +1,6 @@
{
"name": "jquery-qrcode",
"version": "0.10.1",
"version": "0.11.0",
"description": "generate QR codes dynamically",
"homepage": "http://larsjung.de/jquery-qrcode/",
"authors": [
@ -13,14 +13,8 @@
"url": "https://github.com/lrsjng/jquery-qrcode.git"
},
"ignore": [
"**/.*",
"bower_components",
"build",
"local",
"mkrfile.js",
"node_modules",
"src",
"test",
"tests"
"*",
"!dist/*",
"!*.md"
]
}

@ -1,11 +1,11 @@
/* jQuery.qrcode 0.10.1 - http://larsjung.de/jquery-qrcode/ - uses //github.com/kazuhikoarase/qrcode-generator (MIT) */
/* jQuery.qrcode 0.11.0 - http://larsjung.de/jquery-qrcode/ - uses //github.com/kazuhikoarase/qrcode-generator (MIT) */
(function () {
'use strict';
var $ = jQuery;
// Wrapper for the original QR code generator.
var QRCode = function (text, level, version, quiet) {
function QRCode(text, level, version, quiet) {
// `qrcode` is the single public function that will be defined by the `QR Code Generator`
// at the end of the file.
@ -15,9 +15,10 @@ var QRCode = function (text, level, version, quiet) {
quiet = quiet || 0;
var qrModuleCount = qr.getModuleCount(),
quietModuleCount = qr.getModuleCount() + 2*quiet,
isDark = function (row, col) {
var qrModuleCount = qr.getModuleCount();
var quietModuleCount = qr.getModuleCount() + 2*quiet;
function isDark(row, col) {
row -= quiet;
col -= quiet;
@ -27,18 +28,19 @@ var QRCode = function (text, level, version, quiet) {
}
return qr.isDark(row, col);
},
addBlank = function (l, t, r, b) {
}
var addBlank = function (l, t, r, b) {
var prevIsDark = this.isDark,
moduleSize = 1 / quietModuleCount;
var prevIsDark = this.isDark;
var moduleSize = 1 / quietModuleCount;
this.isDark = function (row, col) {
var ml = col * moduleSize,
mt = row * moduleSize,
mr = ml + moduleSize,
mb = mt + moduleSize;
var ml = col * moduleSize;
var mt = row * moduleSize;
var mr = ml + moduleSize;
var mb = mt + moduleSize;
return prevIsDark(row, col) && (l > mr || ml > r || t > mb || mt > b);
};
@ -50,20 +52,19 @@ var QRCode = function (text, level, version, quiet) {
this.moduleCount = quietModuleCount;
this.isDark = isDark;
this.addBlank = addBlank;
},
}
// Check if canvas is available in the browser (as Modernizr does)
canvasAvailable = (function () {
var hasCanvas = (function () {
var elem = document.createElement('canvas');
return !!(elem.getContext && elem.getContext('2d'));
}()),
arcToAvailable = Object.prototype.toString.call(window.opera) !== '[object Opera]',
}());
var hasArcTo = Object.prototype.toString.call(window.opera) !== '[object Opera]';
// Returns a minimal QR code for the given text starting with version `minVersion`.
// Returns `null` if `text` is too long to be encoded in `maxVersion`.
createQRCode = function (text, level, minVersion, maxVersion, quiet) {
// Returns `undefined` if `text` is too long to be encoded in `maxVersion`.
function createQRCode(text, level, minVersion, maxVersion, quiet) {
minVersion = Math.max(1, minVersion || 1);
maxVersion = Math.min(40, maxVersion || 40);
@ -72,24 +73,24 @@ var QRCode = function (text, level, version, quiet) {
return new QRCode(text, level, version, quiet);
} catch (err) {}
}
},
}
drawBackgroundLabel = function (qr, context, settings) {
function drawBackgroundLabel(qr, context, settings) {
var size = settings.size,
font = "bold " + (settings.mSize * size) + "px " + settings.fontname,
ctx = $('<canvas/>')[0].getContext("2d");
var size = settings.size;
var font = "bold " + (settings.mSize * size) + "px " + settings.fontname;
var ctx = $('<canvas/>')[0].getContext("2d");
ctx.font = font;
var w = ctx.measureText(settings.label).width,
sh = settings.mSize,
sw = w / size,
sl = (1 - sw) * settings.mPosX,
st = (1 - sh) * settings.mPosY,
sr = sl + sw,
sb = st + sh,
pad = 0.01;
var w = ctx.measureText(settings.label).width;
var sh = settings.mSize;
var sw = w / size;
var sl = (1 - sw) * settings.mPosX;
var st = (1 - sh) * settings.mPosY;
var sr = sl + sw;
var sb = st + sh;
var pad = 0.01;
if (settings.mode === 1) {
// Strip
@ -102,20 +103,20 @@ var QRCode = function (text, level, version, quiet) {
context.fillStyle = settings.fontcolor;
context.font = font;
context.fillText(settings.label, sl*size, st*size + 0.75 * settings.mSize * size);
},
}
drawBackgroundImage = function (qr, context, settings) {
function drawBackgroundImage(qr, context, settings) {
var size = settings.size,
w = settings.image.naturalWidth || 1,
h = settings.image.naturalHeight || 1,
sh = settings.mSize,
sw = sh * w / h,
sl = (1 - sw) * settings.mPosX,
st = (1 - sh) * settings.mPosY,
sr = sl + sw,
sb = st + sh,
pad = 0.01;
var size = settings.size;
var w = settings.image.naturalWidth || 1;
var h = settings.image.naturalHeight || 1;
var sh = settings.mSize;
var sw = sh * w / h;
var sl = (1 - sw) * settings.mPosX;
var st = (1 - sh) * settings.mPosY;
var sr = sl + sw;
var sb = st + sh;
var pad = 0.01;
if (settings.mode === 3) {
// Strip
@ -126,9 +127,9 @@ var QRCode = function (text, level, version, quiet) {
}
context.drawImage(settings.image, sl*size, st*size, sw*size, sh*size);
},
}
drawBackground = function (qr, context, settings) {
function drawBackground(qr, context, settings) {
if ($(settings.background).is('img')) {
context.drawImage(settings.background, 0, 0, settings.size, settings.size);
@ -143,16 +144,16 @@ var QRCode = function (text, level, version, quiet) {
} else if (mode === 3 || mode === 4) {
drawBackgroundImage(qr, context, settings);
}
},
}
drawModuleDefault = function (qr, context, settings, left, top, width, row, col) {
function drawModuleDefault(qr, context, settings, left, top, width, row, col) {
if (qr.isDark(row, col)) {
context.rect(left, top, width, width);
}
},
}
drawModuleRoundedDark = function (ctx, l, t, r, b, rad, nw, ne, se, sw) {
function drawModuleRoundedDark(ctx, l, t, r, b, rad, nw, ne, se, sw) {
if (nw) {
ctx.moveTo(l + rad, t);
@ -187,9 +188,9 @@ var QRCode = function (text, level, version, quiet) {
} else {
ctx.lineTo(l, t);
}
},
}
drawModuleRoundendLight = function (ctx, l, t, r, b, rad, nw, ne, se, sw) {
function drawModuleRoundendLight(ctx, l, t, r, b, rad, nw, ne, se, sw) {
if (nw) {
ctx.moveTo(l + rad, t);
@ -218,43 +219,43 @@ var QRCode = function (text, level, version, quiet) {
ctx.lineTo(l, b - rad);
ctx.arcTo(l, b, l + rad, b, rad);
}
},
drawModuleRounded = function (qr, context, settings, left, top, width, row, col) {
var isDark = qr.isDark,
right = left + width,
bottom = top + width,
radius = settings.radius * width,
rowT = row - 1,
rowB = row + 1,
colL = col - 1,
colR = col + 1,
center = isDark(row, col),
northwest = isDark(rowT, colL),
north = isDark(rowT, col),
northeast = isDark(rowT, colR),
east = isDark(row, colR),
southeast = isDark(rowB, colR),
south = isDark(rowB, col),
southwest = isDark(rowB, colL),
west = isDark(row, colL);
}
function drawModuleRounded(qr, context, settings, left, top, width, row, col) {
var isDark = qr.isDark;
var right = left + width;
var bottom = top + width;
var radius = settings.radius * width;
var rowT = row - 1;
var rowB = row + 1;
var colL = col - 1;
var colR = col + 1;
var center = isDark(row, col);
var northwest = isDark(rowT, colL);
var north = isDark(rowT, col);
var northeast = isDark(rowT, colR);
var east = isDark(row, colR);
var southeast = isDark(rowB, colR);
var south = isDark(rowB, col);
var southwest = isDark(rowB, colL);
var west = isDark(row, colL);
if (center) {
drawModuleRoundedDark(context, left, top, right, bottom, radius, !north && !west, !north && !east, !south && !east, !south && !west);
} else {
drawModuleRoundendLight(context, left, top, right, bottom, radius, north && west && northwest, north && east && northeast, south && east && southeast, south && west && southwest);
}
},
}
drawModules = function (qr, context, settings) {
function drawModules(qr, context, settings) {
var moduleCount = qr.moduleCount,
moduleSize = settings.size / moduleCount,
fn = drawModuleDefault,
row, col;
var moduleCount = qr.moduleCount;
var moduleSize = settings.size / moduleCount;
var fn = drawModuleDefault;
var row, col;
if (arcToAvailable && settings.radius > 0 && settings.radius <= 0.5) {
if (hasArcTo && settings.radius > 0 && settings.radius <= 0.5) {
fn = drawModuleRounded;
}
@ -285,40 +286,40 @@ var QRCode = function (text, level, version, quiet) {
context.fillStyle = settings.fill;
context.fill();
}
},
}
// Draws QR code to the given `canvas` and returns it.
drawOnCanvas = function (canvas, settings) {
function drawOnCanvas(canvas, settings) {
var qr = createQRCode(settings.text, settings.ecLevel, settings.minVersion, settings.maxVersion, settings.quiet);
if (!qr) {
return null;
}
var $canvas = $(canvas).data('qrcode', qr),
context = $canvas[0].getContext('2d');
var $canvas = $(canvas).data('qrcode', qr);
var context = $canvas[0].getContext('2d');
drawBackground(qr, context, settings);
drawModules(qr, context, settings);
return $canvas;
},
}
// Returns a `canvas` element representing the QR code for the given settings.
createCanvas = function (settings) {
function createCanvas(settings) {
var $canvas = $('<canvas/>').attr('width', settings.size).attr('height', settings.size);
return drawOnCanvas($canvas, settings);
},
}
// Returns an `image` element representing the QR code for the given settings.
createImage = function (settings) {
function createImage(settings) {
return $('<img/>').attr('src', createCanvas(settings)[0].toDataURL('image/png'));
},
}
// Returns a `div` element representing the QR code for the given settings.
createDiv = function (settings) {
function createDiv(settings) {
var qr = createQRCode(settings.text, settings.ecLevel, settings.minVersion, settings.maxVersion, settings.quiet);
if (!qr) {
@ -326,17 +327,17 @@ var QRCode = function (text, level, version, quiet) {
}
// some shortcuts to improve compression
var settings_size = settings.size,
settings_bgColor = settings.background,
math_floor = Math.floor,
var settings_size = settings.size;
var settings_bgColor = settings.background;
var math_floor = Math.floor;
moduleCount = qr.moduleCount,
moduleSize = math_floor(settings_size / moduleCount),
offset = math_floor(0.5 * (settings_size - moduleSize * moduleCount)),
var moduleCount = qr.moduleCount;
var moduleSize = math_floor(settings_size / moduleCount);
var offset = math_floor(0.5 * (settings_size - moduleSize * moduleCount));
row, col,
var row, col;
containerCSS = {
var containerCSS = {
position: 'relative',
left: 0,
top: 0,
@ -344,17 +345,17 @@ var QRCode = function (text, level, version, quiet) {
margin: 0,
width: settings_size,
height: settings_size
},
darkCSS = {
};
var darkCSS = {
position: 'absolute',
padding: 0,
margin: 0,
width: moduleSize,
height: moduleSize,
'background-color': settings.fill
},
};
$div = $('<div/>').data('qrcode', qr).css(containerCSS);
var $div = $('<div/>').data('qrcode', qr).css(containerCSS);
if (settings_bgColor) {
$div.css('background-color', settings_bgColor);
@ -375,25 +376,25 @@ var QRCode = function (text, level, version, quiet) {
}
return $div;
},
}
createHTML = function (settings) {
function createHTML(settings) {
if (canvasAvailable && settings.render === 'canvas') {
if (hasCanvas && settings.render === 'canvas') {
return createCanvas(settings);
} else if (canvasAvailable && settings.render === 'image') {
} else if (hasCanvas && settings.render === 'image') {
return createImage(settings);
}
return createDiv(settings);
},
}
// Plugin
// ======
// Default settings
// ----------------
defaults = {
var defaults = {
// render method: `'canvas'`, `'image'` or `'div'`
render: 'canvas',

File diff suppressed because one or more lines are too long

@ -1,7 +1,7 @@
{
"name": "jquery-qrcode",
"displayName": "jQuery.qrcode",
"version": "0.10.1",
"version": "0.11.0",
"description": "generate QR codes dynamically",
"homepage": "http://larsjung.de/jquery-qrcode/",
"bugs": "https://github.com/lrsjng/jquery-qrcode/issues",
@ -12,12 +12,12 @@
"url": "https://github.com/lrsjng/jquery-qrcode.git"
},
"devDependencies": {
"fquery": "~0.12.17",
"fquery-handlebars": "~0.1.0",
"fquery-includeit": "~0.1.1",
"fquery-jshint": "~0.1.0",
"fquery-jszip": "~0.1.0",
"fquery-uglifyjs": "~0.1.3",
"mkr": "~0.3.0"
"fquery": "~0.16.2",
"fquery-handlebars": "~0.2.0",
"fquery-includeit": "~0.2.0",
"fquery-jshint": "~0.2.0",
"fquery-jszip": "~0.4.0",
"fquery-uglifyjs": "~0.2.1",
"mkr": "~0.6.1"
}
}

@ -4,7 +4,7 @@
var $ = jQuery;
// Wrapper for the original QR code generator.
var QRCode = function (text, level, version, quiet) {
function QRCode(text, level, version, quiet) {
// `qrcode` is the single public function that will be defined by the `QR Code Generator`
// at the end of the file.
@ -14,9 +14,10 @@ var QRCode = function (text, level, version, quiet) {
quiet = quiet || 0;
var qrModuleCount = qr.getModuleCount(),
quietModuleCount = qr.getModuleCount() + 2*quiet,
isDark = function (row, col) {
var qrModuleCount = qr.getModuleCount();
var quietModuleCount = qr.getModuleCount() + 2*quiet;
function isDark(row, col) {
row -= quiet;
col -= quiet;
@ -26,18 +27,19 @@ var QRCode = function (text, level, version, quiet) {
}
return qr.isDark(row, col);
},
addBlank = function (l, t, r, b) {
}
var addBlank = function (l, t, r, b) {
var prevIsDark = this.isDark,
moduleSize = 1 / quietModuleCount;
var prevIsDark = this.isDark;
var moduleSize = 1 / quietModuleCount;
this.isDark = function (row, col) {
var ml = col * moduleSize,
mt = row * moduleSize,
mr = ml + moduleSize,
mb = mt + moduleSize;
var ml = col * moduleSize;
var mt = row * moduleSize;
var mr = ml + moduleSize;
var mb = mt + moduleSize;
return prevIsDark(row, col) && (l > mr || ml > r || t > mb || mt > b);
};
@ -49,20 +51,19 @@ var QRCode = function (text, level, version, quiet) {
this.moduleCount = quietModuleCount;
this.isDark = isDark;
this.addBlank = addBlank;
},
}
// Check if canvas is available in the browser (as Modernizr does)
canvasAvailable = (function () {
var hasCanvas = (function () {
var elem = document.createElement('canvas');
return !!(elem.getContext && elem.getContext('2d'));
}()),
arcToAvailable = Object.prototype.toString.call(window.opera) !== '[object Opera]',
}());
var hasArcTo = Object.prototype.toString.call(window.opera) !== '[object Opera]';
// Returns a minimal QR code for the given text starting with version `minVersion`.
// Returns `null` if `text` is too long to be encoded in `maxVersion`.
createQRCode = function (text, level, minVersion, maxVersion, quiet) {
// Returns `undefined` if `text` is too long to be encoded in `maxVersion`.
function createQRCode(text, level, minVersion, maxVersion, quiet) {
minVersion = Math.max(1, minVersion || 1);
maxVersion = Math.min(40, maxVersion || 40);
@ -71,24 +72,24 @@ var QRCode = function (text, level, version, quiet) {
return new QRCode(text, level, version, quiet);
} catch (err) {}
}
},
}
drawBackgroundLabel = function (qr, context, settings) {
function drawBackgroundLabel(qr, context, settings) {
var size = settings.size,
font = "bold " + (settings.mSize * size) + "px " + settings.fontname,
ctx = $('<canvas/>')[0].getContext("2d");
var size = settings.size;
var font = "bold " + (settings.mSize * size) + "px " + settings.fontname;
var ctx = $('<canvas/>')[0].getContext("2d");
ctx.font = font;
var w = ctx.measureText(settings.label).width,
sh = settings.mSize,
sw = w / size,
sl = (1 - sw) * settings.mPosX,
st = (1 - sh) * settings.mPosY,
sr = sl + sw,
sb = st + sh,
pad = 0.01;
var w = ctx.measureText(settings.label).width;
var sh = settings.mSize;
var sw = w / size;
var sl = (1 - sw) * settings.mPosX;
var st = (1 - sh) * settings.mPosY;
var sr = sl + sw;
var sb = st + sh;
var pad = 0.01;
if (settings.mode === 1) {
// Strip
@ -101,20 +102,20 @@ var QRCode = function (text, level, version, quiet) {
context.fillStyle = settings.fontcolor;
context.font = font;
context.fillText(settings.label, sl*size, st*size + 0.75 * settings.mSize * size);
},
}
drawBackgroundImage = function (qr, context, settings) {
function drawBackgroundImage(qr, context, settings) {
var size = settings.size,
w = settings.image.naturalWidth || 1,
h = settings.image.naturalHeight || 1,
sh = settings.mSize,
sw = sh * w / h,
sl = (1 - sw) * settings.mPosX,
st = (1 - sh) * settings.mPosY,
sr = sl + sw,
sb = st + sh,
pad = 0.01;
var size = settings.size;
var w = settings.image.naturalWidth || 1;
var h = settings.image.naturalHeight || 1;
var sh = settings.mSize;
var sw = sh * w / h;
var sl = (1 - sw) * settings.mPosX;
var st = (1 - sh) * settings.mPosY;
var sr = sl + sw;
var sb = st + sh;
var pad = 0.01;
if (settings.mode === 3) {
// Strip
@ -125,9 +126,9 @@ var QRCode = function (text, level, version, quiet) {
}
context.drawImage(settings.image, sl*size, st*size, sw*size, sh*size);
},
}
drawBackground = function (qr, context, settings) {
function drawBackground(qr, context, settings) {
if ($(settings.background).is('img')) {
context.drawImage(settings.background, 0, 0, settings.size, settings.size);
@ -142,16 +143,16 @@ var QRCode = function (text, level, version, quiet) {
} else if (mode === 3 || mode === 4) {
drawBackgroundImage(qr, context, settings);
}
},
}
drawModuleDefault = function (qr, context, settings, left, top, width, row, col) {
function drawModuleDefault(qr, context, settings, left, top, width, row, col) {
if (qr.isDark(row, col)) {
context.rect(left, top, width, width);
}
},
}
drawModuleRoundedDark = function (ctx, l, t, r, b, rad, nw, ne, se, sw) {
function drawModuleRoundedDark(ctx, l, t, r, b, rad, nw, ne, se, sw) {
if (nw) {
ctx.moveTo(l + rad, t);
@ -186,9 +187,9 @@ var QRCode = function (text, level, version, quiet) {
} else {
ctx.lineTo(l, t);
}
},
}
drawModuleRoundendLight = function (ctx, l, t, r, b, rad, nw, ne, se, sw) {
function drawModuleRoundendLight(ctx, l, t, r, b, rad, nw, ne, se, sw) {
if (nw) {
ctx.moveTo(l + rad, t);
@ -217,43 +218,43 @@ var QRCode = function (text, level, version, quiet) {
ctx.lineTo(l, b - rad);
ctx.arcTo(l, b, l + rad, b, rad);
}
},
drawModuleRounded = function (qr, context, settings, left, top, width, row, col) {
var isDark = qr.isDark,
right = left + width,
bottom = top + width,
radius = settings.radius * width,
rowT = row - 1,
rowB = row + 1,
colL = col - 1,
colR = col + 1,
center = isDark(row, col),
northwest = isDark(rowT, colL),
north = isDark(rowT, col),
northeast = isDark(rowT, colR),
east = isDark(row, colR),
southeast = isDark(rowB, colR),
south = isDark(rowB, col),
southwest = isDark(rowB, colL),
west = isDark(row, colL);
}
function drawModuleRounded(qr, context, settings, left, top, width, row, col) {
var isDark = qr.isDark;
var right = left + width;
var bottom = top + width;
var radius = settings.radius * width;
var rowT = row - 1;
var rowB = row + 1;
var colL = col - 1;
var colR = col + 1;
var center = isDark(row, col);
var northwest = isDark(rowT, colL);
var north = isDark(rowT, col);
var northeast = isDark(rowT, colR);
var east = isDark(row, colR);
var southeast = isDark(rowB, colR);
var south = isDark(rowB, col);
var southwest = isDark(rowB, colL);
var west = isDark(row, colL);
if (center) {
drawModuleRoundedDark(context, left, top, right, bottom, radius, !north && !west, !north && !east, !south && !east, !south && !west);
} else {
drawModuleRoundendLight(context, left, top, right, bottom, radius, north && west && northwest, north && east && northeast, south && east && southeast, south && west && southwest);
}
},
}
drawModules = function (qr, context, settings) {
function drawModules(qr, context, settings) {
var moduleCount = qr.moduleCount,
moduleSize = settings.size / moduleCount,
fn = drawModuleDefault,
row, col;
var moduleCount = qr.moduleCount;
var moduleSize = settings.size / moduleCount;
var fn = drawModuleDefault;
var row, col;
if (arcToAvailable && settings.radius > 0 && settings.radius <= 0.5) {
if (hasArcTo && settings.radius > 0 && settings.radius <= 0.5) {
fn = drawModuleRounded;
}
@ -284,40 +285,40 @@ var QRCode = function (text, level, version, quiet) {
context.fillStyle = settings.fill;
context.fill();
}
},
}
// Draws QR code to the given `canvas` and returns it.
drawOnCanvas = function (canvas, settings) {
function drawOnCanvas(canvas, settings) {
var qr = createQRCode(settings.text, settings.ecLevel, settings.minVersion, settings.maxVersion, settings.quiet);
if (!qr) {
return null;
}
var $canvas = $(canvas).data('qrcode', qr),
context = $canvas[0].getContext('2d');
var $canvas = $(canvas).data('qrcode', qr);
var context = $canvas[0].getContext('2d');
drawBackground(qr, context, settings);
drawModules(qr, context, settings);
return $canvas;
},
}
// Returns a `canvas` element representing the QR code for the given settings.
createCanvas = function (settings) {
function createCanvas(settings) {
var $canvas = $('<canvas/>').attr('width', settings.size).attr('height', settings.size);
return drawOnCanvas($canvas, settings);
},
}
// Returns an `image` element representing the QR code for the given settings.
createImage = function (settings) {
function createImage(settings) {
return $('<img/>').attr('src', createCanvas(settings)[0].toDataURL('image/png'));
},
}
// Returns a `div` element representing the QR code for the given settings.
createDiv = function (settings) {
function createDiv(settings) {
var qr = createQRCode(settings.text, settings.ecLevel, settings.minVersion, settings.maxVersion, settings.quiet);
if (!qr) {
@ -325,17 +326,17 @@ var QRCode = function (text, level, version, quiet) {
}
// some shortcuts to improve compression
var settings_size = settings.size,
settings_bgColor = settings.background,
math_floor = Math.floor,
var settings_size = settings.size;
var settings_bgColor = settings.background;
var math_floor = Math.floor;
moduleCount = qr.moduleCount,
moduleSize = math_floor(settings_size / moduleCount),
offset = math_floor(0.5 * (settings_size - moduleSize * moduleCount)),
var moduleCount = qr.moduleCount;
var moduleSize = math_floor(settings_size / moduleCount);
var offset = math_floor(0.5 * (settings_size - moduleSize * moduleCount));
row, col,
var row, col;
containerCSS = {
var containerCSS = {
position: 'relative',
left: 0,
top: 0,
@ -343,17 +344,17 @@ var QRCode = function (text, level, version, quiet) {
margin: 0,
width: settings_size,
height: settings_size
},
darkCSS = {
};
var darkCSS = {
position: 'absolute',
padding: 0,
margin: 0,
width: moduleSize,
height: moduleSize,
'background-color': settings.fill
},
};
$div = $('<div/>').data('qrcode', qr).css(containerCSS);
var $div = $('<div/>').data('qrcode', qr).css(containerCSS);
if (settings_bgColor) {
$div.css('background-color', settings_bgColor);
@ -374,25 +375,25 @@ var QRCode = function (text, level, version, quiet) {
}
return $div;
},
}
createHTML = function (settings) {
function createHTML(settings) {
if (canvasAvailable && settings.render === 'canvas') {
if (hasCanvas && settings.render === 'canvas') {
return createCanvas(settings);
} else if (canvasAvailable && settings.render === 'image') {
} else if (hasCanvas && settings.render === 'image') {
return createImage(settings);
}
return createDiv(settings);
},
}
// Plugin
// ======
// Default settings
// ----------------
defaults = {
var defaults = {
// render method: `'canvas'`, `'image'` or `'div'`
render: 'canvas',

Loading…
Cancel
Save