aboutsummaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2012-10-20 15:15:37 -0700
committerAdam Soltys <[email protected]>2012-10-20 15:15:37 -0700
commit5ec0a340957a90afe2bcf7073cc368eee77bf856 (patch)
tree6077d934ea7a612675270b1c8cc74ddafb44a119 /js
parent72f56049fc3ed930e5c1aa887f3c21c36b9bc9e5 (diff)
parent4c39b9594ea452b82452627166100621621ca982 (diff)
downloadcoinos-server-5ec0a340957a90afe2bcf7073cc368eee77bf856.tar.gz
coinos-server-5ec0a340957a90afe2bcf7073cc368eee77bf856.zip
Merge branch 'master' of https://github.com/asoltys/bitcoin_pos
Diffstat (limited to 'js')
-rw-r--r--js/bitcoin_pos.js9
1 files changed, 3 insertions, 6 deletions
diff --git a/js/bitcoin_pos.js b/js/bitcoin_pos.js
index 896b04b5..54f2fe94 100644
--- a/js/bitcoin_pos.js
+++ b/js/bitcoin_pos.js
@@ -5,15 +5,12 @@ $(function() {
var received = 0;
var address = getParameterByName('address');
- $('#received').hide();
- $('div.container-fluid').css('width', Math.min(screen.width, 600) + 'px');
-
- setupqr();
-
if (address == "")
window.location = 'index.html?address=1KDaKixtYqPdDNsu3fMeAHHB52R2WHvXCQ'
-
+ setupqr();
+ $('#received').hide()
+ $('div.container-fluid').css('width', Math.min(screen.width, 600) + 'px');
$('#address').html(address);
websocket.onopen = function() {