aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2014-08-17 08:27:28 -0700
committerAdam Soltys <[email protected]>2014-08-17 08:27:28 -0700
commit64edb5636736a9c897958e7b743374addba96bcb (patch)
tree3082599c776e9714c645b72b6440afa7f8177280
parentf48c6901be874dabd4ed9ef6b31052c9b628e4a3 (diff)
downloadcoinos-server-64edb5636736a9c897958e7b743374addba96bcb.tar.gz
coinos-server-64edb5636736a9c897958e7b743374addba96bcb.zip
Display address
-rw-r--r--public/js/calculator.coffee5
-rw-r--r--src/socket_test.coffee14
2 files changed, 1 insertions, 18 deletions
diff --git a/public/js/calculator.coffee b/public/js/calculator.coffee
index 64055022..c22d05ee 100644
--- a/public/js/calculator.coffee
+++ b/public/js/calculator.coffee
@@ -70,10 +70,7 @@ setup = ->
$('#logo').attr('src', '/assets/img/bitcoin.png').show()
$('#logo').click -> $(location).attr("href","/#{g.user}/edit")
- address = g.address
- if g.user? and g.user
- address = "#{address} <a href='http://blockchain.info/address/#{address}' target='_blank'><img src='/assets/img/blockchain.png' /></a>"
-
+ $('#address').html("#{address} <a href='http://blockchain.info/address/#{address}' target='_blank'><img src='/assets/img/blockchain.png' /></a>")
$('#symbol').html(g.symbol + " bid")
$('#currency').html(g.currency)
$('#received').hide()
diff --git a/src/socket_test.coffee b/src/socket_test.coffee
deleted file mode 100644
index 315be3a3..00000000
--- a/src/socket_test.coffee
+++ /dev/null
@@ -1,14 +0,0 @@
- transaction = {"hash":{},"version":1,"lock_time":0,"ins":[{"s":{},"q":4294967295,"o":{}}],"outs":[{"v":{},"s":{}},{"v":{},"s":{}}],"_buffer":{},"txid":"8500a0893a2d83a17819673884ade21bbef07d8c92bfe51682e45873cc2d3720","vin":[{"n":0,"txid":"1549415465c84fb519ffb92339ef80461427502c90d5d3ac5d01f27d824feabd","vout":1}],"vout":[{"valueSat":10000,"scriptPubKey":{"addresses":["1VAnbtCAnYccECnjaMCPnWwt81EHCVgNr"]},"n":0},{"valueSat":3966838180,"scriptPubKey":{"addresses":["1Ao8Swc6vSosrjednQkNZeXEXVu1ZcxYZE"]},"n":1}],"time":1405573125}
-
- $('body').append(transaction.vout[0].valueSat)
-
- socket = io('ws://insight.bitpay.com')
- socket.on('connect', ->
- $('body').append('connected')
- this.emit('subscribe', '1VAnbtCAnYccECnjaMCPnWwt81EHCVgNr')
- )
-
- socket.on('1VAnbtCAnYccECnjaMCPnWwt81EHCVgNr', (data) ->
- $('body').append(JSON.stringify(data))
- )
-