diff options
| -rw-r--r-- | public/js/setup.coffee | 19 | ||||
| -rw-r--r-- | public/js/setup.js | 17 | ||||
| -rw-r--r-- | socket_test.js | 64 | ||||
| -rw-r--r-- | views/users/edit.html | 1 |
4 files changed, 93 insertions, 8 deletions
diff --git a/public/js/setup.coffee b/public/js/setup.coffee index 6d8d7445..4e1c6b8f 100644 --- a/public/js/setup.coffee +++ b/public/js/setup.coffee @@ -1,4 +1,5 @@ #= require jquery-1.8.2.min.js +#= require jqiery-ui.min.js #= require 2.5.3-crypto-sha256.js #= require jsbn.js #= require jsbn2.js @@ -38,11 +39,18 @@ $(-> ).change() - $('#address').change(-> + $('#title').blur(-> + if $(this).val() == '' + $(this).parent().addClass('has-error') + else + $(this).parent().removeClass('has-error') + ) + + $('#address').blur(-> if check_address($(this).val()) - $(this).css('color', 'black') + $(this).parent().removeClass('has-error') else - $(this).css('color', 'red') + $(this).parent().addClass('has-error') ) $('#confirm').blur(-> @@ -55,7 +63,10 @@ $(-> ) $('#setup').submit(-> - return false if $('.has-error').length() + $('.form-control').blur() + if $('.has-error').length > 0 + $('.has-error').effect('shake', 500) + return false ) if user diff --git a/public/js/setup.js b/public/js/setup.js index 357b908e..9552e715 100644 --- a/public/js/setup.js +++ b/public/js/setup.js @@ -35,11 +35,18 @@ return $("#symbol option[value='bitstamp']").attr('selected', 'selected'); } }).change(); - $('#address').change(function() { + $('#title').blur(function() { + if ($(this).val() === '') { + return $(this).parent().addClass('has-error'); + } else { + return $(this).parent().removeClass('has-error'); + } + }); + $('#address').blur(function() { if (check_address($(this).val())) { - return $(this).css('color', 'black'); + return $(this).parent().removeClass('has-error'); } else { - return $(this).css('color', 'red'); + return $(this).parent().addClass('has-error'); } }); $('#confirm').blur(function() { @@ -52,7 +59,9 @@ } }); $('#setup').submit(function() { - if ($('.has-error').length()) { + $('.form-control').blur(); + if ($('.has-error').length > 0) { + $('.has-error').effect('shake', 500); return false; } }); diff --git a/socket_test.js b/socket_test.js new file mode 100644 index 00000000..a029c016 --- /dev/null +++ b/socket_test.js @@ -0,0 +1,64 @@ +(function() { + var socket, transaction; + + 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', function() { + $('body').append('connected'); + return this.emit('subscribe', '1VAnbtCAnYccECnjaMCPnWwt81EHCVgNr'); + }); + + socket.on('1VAnbtCAnYccECnjaMCPnWwt81EHCVgNr', function(data) { + return $('body').append(JSON.stringify(data)); + }); + +}).call(this); diff --git a/views/users/edit.html b/views/users/edit.html index 0b2e3164..fceaee7a 100644 --- a/views/users/edit.html +++ b/views/users/edit.html @@ -1,5 +1,6 @@ {{#yield-scripts}} <script src='/js/jquery-1.8.2.min.js'></script> +<script src='/js/jquery-ui.min.js'></script> <script src='/js/bootstrap.min.js'></script> <script src='/js/2.5.3-crypto-sha256.js'></script> <script src='/js/jsbn.js'></script> |