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

Merge pull request #1578 from cmgustavo/bug/paypro-chrome-extension

Browse source 
Bug/paypro chrome extension
This commit is contained in:
Matias Alejo Garcia 2014-10-25 14:15:48 -03:00
commit c0c1c18e2e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
browser-extensions/chrome/manifest.json
View file

@ -9,6 +9,7 @@
"default_icon": "img/icons/icon.png", "default_icon": "img/icons/icon.png",
"default_popup": "popup.html" "default_popup": "popup.html"
}, },
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
"permissions": [ "permissions": [
"tabs", "storage", "notifications" "tabs", "storage", "notifications"
], ],

3
js/controllers/send.js
View file

@ -288,9 +288,8 @@ angular.module('copayApp.controllers').controller('SendController',
qrcode.callback = function(data) { qrcode.callback = function(data) {
_scanStop(); _scanStop();
var str = (data.indexOf('bitcoin:') === 0) ? data.substring(8) : data;
$scope.$apply(function() { $scope.$apply(function() {
$scope.address = str; $scope.sendForm.address.$setViewValue(data);
}); });
}; };