Merge branch 'release'

ripple · Aug 22, 2014 · 63b17e2 · 63b17e2
2 parents 243322c + e2d6206
commit 63b17e2
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 42 deletions.
diff --git a/deps/js/ripple.js b/deps/js/ripple.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ripple-client",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Client for the Ripple payment network",
   "author": {
     "name": "Ripple Labs, Inc.",

diff --git a/src/js/services/authinfo.js b/src/js/services/authinfo.js
@@ -1,3 +1,4 @@
+
 /**
  * AUTH INFO
  *
@@ -47,7 +48,7 @@ module.factory('rpAuthInfo', ['$rootScope', 'rpRippleTxt', '$http',
           },
           error: function () {
             $scope.$apply(function() {
-              callback(new Error("Authentication info server unreachable"));
+              callback(new Error("Cannot connect to our login system, please try again later or contact [email protected]."));
             });
           },
           success: function (data) {

diff --git a/src/js/services/books.js b/src/js/services/books.js
@@ -42,13 +42,13 @@ function(net, $q, $scope, $filter, $id) {
       if (d.TakerGets.value) {
         d.TakerGets.value = d.taker_gets_funded;
       } else {
-        d.TakerGets = d.taker_gets_funded;
+        d.TakerGets = parseInt(Number(d.taker_gets_funded), 10);
       }
 
       if (d.TakerPays.value) {
         d.TakerPays.value = d.taker_pays_funded;
       } else {
-        d.TakerPays = d.taker_pays_funded;
+        d.TakerPays = parseInt(Number(d.taker_pays_funded), 10);
       }
 
       d.TakerGets = Amount.from_json(d.TakerGets);