Permalink
Browse files

Merge branch 'fix-gray-lines' of https://github.com/ljos/jquery-qrcode

Conflicts:
	src/jquery.qrcode.js
  • Loading branch information...
2 parents 3e8586d + 386c0b4 commit 2b253c58f4f23f7c522c9f24627d4a51412f8588 @jeromeetienne committed Mar 27, 2012
Showing with 10 additions and 7 deletions.
  1. +2 −2 Makefile
  2. +1 −1 examples/basic.html
  3. +4 −3 jquery.qrcode.min.js
  4. +3 −1 src/jquery.qrcode.js
View
@@ -5,7 +5,7 @@ all:
server:
python -m SimpleHTTPServer
-build: minify homepage_build
+build: minify
minify:
echo > /tmp/jquery.qrcode.tmp.js
@@ -25,7 +25,7 @@ homepage_build:
# deploy #
#################################################################################
-deploy:
+deploy: build
# assume there is something to commit
# use "git diff --exit-code HEAD" to know if there is something to commit
# so two lines: one if no commit, one if something to commit
View
@@ -13,7 +13,7 @@
<script>
//jQuery('#qrcode').qrcode("this plugin is great");
jQuery('#qrcode').qrcode({
- render : "table",
+ //render : "table",
text : "http://jetienne.com"
});
</script>
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -37,7 +37,9 @@
for( var row = 0; row < qrcode.getModuleCount(); row++ ){
for( var col = 0; col < qrcode.getModuleCount(); col++ ){
ctx.fillStyle = qrcode.isDark(row, col) ? options.foreground : options.background;
- ctx.fillRect( col*tileW, row*tileH, tileW, tileH );
+ var w = (Math.ceil((col+1)*tileW) - Math.floor(col*tileW));
+ var h = (Math.ceil((row+1)*tileW) - Math.floor(row*tileW));
+ ctx.fillRect(Math.round(col*tileW),Math.round(row*tileH), w, h);
}
}
// return just built canvas

0 comments on commit 2b253c5

Please sign in to comment.