From cac8628660d661ad4e1adf8a81413a69e3f9e50e Mon Sep 17 00:00:00 2001
From: Eduard Castellano <educastellano08@gmail.com>
Date: Tue, 31 Mar 2015 13:57:20 +0530
Subject: [PATCH] margin fix

---
 qr.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qr.js b/qr.js
index 32da312..a2bb8e8 100644
--- 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);