BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update bitcore

This commit is contained in:
Matias Alejo Garcia 2014-12-19 19:10:34 -03:00
parent 89d8aaeffe
commit 9019c3a6fc
3 changed files with 279 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app.js
View File

@ -2,6 +2,14 @@ var express = require('express');
var http = require('http'); var http = require('http');
var app = express(); var app = express();
// This is not really necesarry, just to simulate
// Content Security Policy from Google Chrome Apps.
//
// app.use(function(req, res, next){
// res.header("Content-Security-Policy", "script-src 'self';object-src 'none';media-src 'self';frame-src 'none';font-src 'self' data:");
// next();
// });
app.use('/', express.static(__dirname + '/')); app.use('/', express.static(__dirname + '/'));
app.get('*', function(req, res) { app.get('*', function(req, res) {
return res.sendFile(__dirname + '/' + 'index.html'); return res.sendFile(__dirname + '/' + 'index.html');

8
js/controllers/send.js
View File

@ -392,10 +392,18 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.setFromPayPro = function(uri) { $scope.setFromPayPro = function(uri) {
var isChromeApp = window.chrome && chrome.runtime && chrome.runtime.id;
if (isChromeApp) {
$scope.error = 'Payment Protocol not yet supported on ChromeApp';
return;
}
var w = $rootScope.wallet; var w = $rootScope.wallet;
$scope.fetchingURL = uri; $scope.fetchingURL = uri;
$scope.loading = true; $scope.loading = true;
// Payment Protocol URI (BIP-72) // Payment Protocol URI (BIP-72)
w.fetchPaymentRequest({ w.fetchPaymentRequest({
url: uri url: uri

448
lib/bitcore.js
View File

File diff suppressed because one or more lines are too long