aboutsummaryrefslogtreecommitdiffstats
path: root/public/js/calculator.coffee
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2013-03-21 16:48:38 -0700
committerAdam Soltys <[email protected]>2013-03-21 16:49:21 -0700
commitfdfbd5bc09d5a836daf995ae57fdbbb259193b8c (patch)
tree6d9ecc417cbb08a97e3e6e1caaa186fc8d8bd41b /public/js/calculator.coffee
parentcb33def0aba30a6b67707f41efdc9385ab09b07c (diff)
downloadcoinos-server-fdfbd5bc09d5a836daf995ae57fdbbb259193b8c.tar.gz
coinos-server-fdfbd5bc09d5a836daf995ae57fdbbb259193b8c.zip
Switch QR code libraries
Diffstat (limited to 'public/js/calculator.coffee')
-rw-r--r--public/js/calculator.coffee5
1 files changed, 2 insertions, 3 deletions
diff --git a/public/js/calculator.coffee b/public/js/calculator.coffee
index c9d3f017..6c68ae85 100644
--- a/public/js/calculator.coffee
+++ b/public/js/calculator.coffee
@@ -1,6 +1,6 @@
#= require jquery-1.8.2.min.js
#= require moment.min.js
-#= require qr.js
+#= require qrcode.js
#= require bootstrap.min.js
#= require 2.5.3-crypto-sha256.js
#= require jsbn.js
@@ -75,7 +75,6 @@ setup = ->
$('#currency').html(g.symbol.slice(-3))
$('#received').hide()
- setupQR()
setupSocket()
fetchExchangeRate()
@@ -154,7 +153,7 @@ updateTotal = ->
total = ''
$('#total').html(total.toString())
- displayQR('bitcoin:' + g.address + '?amount=' + total.toString())
+ new QRCode('qr', "bitcoin: #{g.address}?amount=#{total.toString()}")
fail = (msg) ->
g.errors.push(msg)