Merge pull request #2 from educastellano/fix

margin fix
lifthrasiir · Mar 31, 2015 · b3d7fde · b3d7fde
2 parents 4024a26 + cac8628
commit b3d7fde
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/qr.js b/qr.js
@@ -707,7 +707,7 @@ var QRCode = {
 		options = options || {};
 		var matrix = QRCode['generate'](data, options);
 		var modsize = Math.max(options.modulesize || 5, 0.5);
-		var margin = Math.max(options.margin || 4, 0.0);
+		var margin = Math.max(options.margin !== null ? options.margin : 4, 0.0);
 
 		var e = document.createElement('div');
 		var n = matrix.length;
@@ -730,7 +730,7 @@ var QRCode = {
 		options = options || {};
 		var matrix = QRCode['generate'](data, options);
 		var modsize = Math.max(options.modulesize || 5, 0.5);
-		var margin = Math.max(options.margin || 4, 0.0);
+		var margin = Math.max(options.margin !== null ? options.margin : 4, 0.0);
 		var n = matrix.length;
 		var size = modsize * (n + 2 * margin);