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

paypro: stop using global $http.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-08-06 09:58:16 -07:00 • committed by Manuel Araoz
commit 052e2522be
3 changed files with 13 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,10 +25,6 @@ var TxProposals = require('./TxProposals');
var PrivateKey = require('./PrivateKey');
var copayConfig = require('../../../config');
var G = typeof window !== 'undefined'
? window
: global;
function Wallet(opts) {
var self = this;
@ -804,7 +800,7 @@ Wallet.prototype.createPaymentTx = function(options, cb) {
return;
}
return $http({
return Wallet.request({
method: options.method || 'POST',
url: options.uri,
headers: {
@ -1041,7 +1037,7 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
view[i] = pay[i];
}
return $http({
return Wallet.request({
method: 'POST',
url: txp.merchant.pr.pd.payment_url,
headers: {
@ -1719,10 +1715,10 @@ Wallet.prototype.verifySignedJson = function(senderId, payload, signature) {
// deviates from BIP-70.
// if (typeof angular !== 'undefined') {
// G.$http = G.$http || angular.bootstrap().get('$http');
// var $http = angular.bootstrap().get('$http');
// }
G.$http = G.$http || function $http(options, callback) {
Wallet.request = function(options, callback) {
if (typeof options === 'string') {
options = { uri: options };
}