Convert to using a directive instead of regex

jshint updates Rename usock_exception
oztc · May 31, 2015 · b39e8d5 · b39e8d5
1 parent 0ea077a
commit b39e8d5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/html/directives/validateBitcoinAddress.js b/html/directives/validateBitcoinAddress.js
@@ -4,11 +4,10 @@ angular.module('app').directive("validateBitcoinAddress", function() {
         link: function(scope, ele, attrs, ctrl) {
 
             ctrl.$parsers.unshift(function(value) {
-                if(value){
-                    // test and set the validity after update.
-                    var valid = window.bitcoinAddress.validate(value);
-                    ctrl.$setValidity('validateBitcoinAddress', valid);
-                }
+
+                // test and set the validity after update.
+                var valid = window.bitcoinAddress.validate(value);
+                ctrl.$setValidity('validateBitcoinAddress', valid);
 
                 // if it's valid, return the value to the model,
                 // otherwise return undefined.
@@ -25,6 +24,6 @@ angular.module('app').directive("validateBitcoinAddress", function() {
 
 
         }
-    }
+    };
 
 });
diff --git a/html/partials/modal/viewOrder.html b/html/partials/modal/viewOrder.html
@@ -45,7 +45,7 @@ <h3>Shipping & Payment</h3>
                                 <strong>Where would you like payment sent to? </strong>
                             </div>
                             <div class="col-sm-7 {{releasePaymentForm.bitcoinPaymentAddress.$invalid ? 'has-error' : ''}}">
-                                <input type="text" required data-ng-pattern="/^[a-zA-Z0-9\-]+$/" data-ng-maxlength="35" data-ng-minlength="26" class="form-control text" name="bitcoinPaymentAddress" data-ng-model="Market.modalOrder.paymentAddress" placeholder="Enter a Bitcoin address"/>
+                                <input type="text" required validate-bitcoin-address class="form-control text" name="bitcoinPaymentAddress" data-ng-model="Market.modalOrder.paymentAddress" placeholder="Enter a Bitcoin address"/>
                             </div>
                                 </div>
                             <div class="row" style="margin-top:10px;">

diff --git a/html/vendors/bitcoinAddress.js b/html/vendors/bitcoinAddress.js
@@ -4303,4 +4303,4 @@ return /******/ (function(modules) { // webpackBootstrap
 /***/ }
 /******/ ])
 });
-;
+;
diff --git a/node/ws.py b/node/ws.py
@@ -548,8 +548,8 @@ def get_ticker():
                 usock = urllib2.urlopen(url)
                 data = usock.read()
                 usock.close()
-            except Exception as e:
-                self.log.error('Cannot retrieve ticker info: %s', e.message)
+            except Exception as usock_exception:
+                self.log.error('Cannot retrieve ticker info: %s', usock_exception.message)
                 return
 
             self.send_to_client(None, {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4303,4 +4303,4 @@ return /******/ (function(modules) { // webpackBootstrap @@
     /***/ }
     /******/ ])
     });
-    ;
+    ;