anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

paypro: remove old parse uri code. more debugging.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-07-30 17:20:50 -07:00 • committed by Manuel Araoz
commit 7915008433
3 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/models/core/Wallet.js
View file

@ -25,11 +25,17 @@ var TxProposals = require('./TxProposals');
var PrivateKey = require('./PrivateKey');
var copayConfig = require('../../../config');
if (typeof angular !== 'undefined') {
var $http = angular.bootstrap().get('$http');
if (typeof window !== 'undefined') {
var G = window;
} else {
var G = global;
}
var $http = function $http(options, callback) {
if (typeof angular !== 'undefined') {
var $http = G.$http || angular.bootstrap().get('$http');
}
var $http = G.$http || function $http(options, callback) {
if (typeof options === 'string') {
options = { uri: options };
}
@ -81,7 +87,6 @@ var $http = function $http(options, callback) {
xhr.onload = function(event) {
var response = xhr.response;
var buf = new Uint8Array(response);
// return callback(null, xhr, buf);
var headers = {};
(xhr.getAllResponseHeaders() || '').replace(
/(?:\r?\n|^)([^:\r\n]+): *([^\r\n]+)/g,
@ -93,7 +98,7 @@ var $http = function $http(options, callback) {
};
xhr.onerror = function(event) {
return ret._error(null, event, null, options);
return ret._error(null, new Error(event.message), null, options);
};
if (options.body) {
@ -105,8 +110,6 @@ var $http = function $http(options, callback) {
return ret;
}
// require('request')(options, callback);
return ret;
}