mirror of https://github.com/BTCPrivate/copay.git
Move address modal to a separate file, rename html files and reintroduce bitcoin protocol handler
This commit is contained in:
parent
0c3709ceee
commit
5f27f1e7a6
|
@ -25,7 +25,7 @@ angular.module('copayApp.controllers').controller('AddressesController',
|
||||||
};
|
};
|
||||||
|
|
||||||
$modal.open({
|
$modal.open({
|
||||||
templateUrl: 'addressModal.html',
|
templateUrl: 'views/modals/qr-address.html',
|
||||||
controller: ModalInstanceCtrl,
|
controller: ModalInstanceCtrl,
|
||||||
resolve: {
|
resolve: {
|
||||||
address: function() { return address; }
|
address: function() { return address; }
|
||||||
|
|
|
@ -206,7 +206,7 @@ angular.module('copayApp.controllers').controller('SendController',
|
||||||
|
|
||||||
$scope.openAddressBookModal = function() {
|
$scope.openAddressBookModal = function() {
|
||||||
var modalInstance = $modal.open({
|
var modalInstance = $modal.open({
|
||||||
templateUrl: 'views/modals/addressbook.html',
|
templateUrl: 'views/modals/address-book.html',
|
||||||
windowClass: 'tiny',
|
windowClass: 'tiny',
|
||||||
controller: function($scope, $modalInstance) {
|
controller: function($scope, $modalInstance) {
|
||||||
|
|
||||||
|
|
|
@ -45,8 +45,8 @@ angular
|
||||||
.when('/unsupported', {
|
.when('/unsupported', {
|
||||||
templateUrl: 'views/unsupported.html'
|
templateUrl: 'views/unsupported.html'
|
||||||
})
|
})
|
||||||
.when('/uri_payment/:data', {
|
.when('/uri-payment/:data', {
|
||||||
templateUrl: 'views/uri_payment.html'
|
templateUrl: 'views/uri-payment.html'
|
||||||
})
|
})
|
||||||
.otherwise({
|
.otherwise({
|
||||||
templateUrl: 'views/errors/404.html',
|
templateUrl: 'views/errors/404.html',
|
||||||
|
|
|
@ -4,8 +4,8 @@ var UriHandler = function() {};
|
||||||
|
|
||||||
UriHandler.prototype.register = function() {
|
UriHandler.prototype.register = function() {
|
||||||
var base = window.location.origin + '/';
|
var base = window.location.origin + '/';
|
||||||
var url = base + '#/uri_payment/%s';
|
var url = base + '#/uri-payment/%s';
|
||||||
// navigator.registerProtocolHandler('bitcoin', url, 'Copay');
|
navigator.registerProtocolHandler('bitcoin', url, 'Copay');
|
||||||
};
|
};
|
||||||
|
|
||||||
angular.module('copayApp.services').value('uriHandler', new UriHandler());
|
angular.module('copayApp.services').value('uriHandler', new UriHandler());
|
||||||
|
|
|
@ -30,18 +30,6 @@
|
||||||
<span ng-if="showAll">Show less</span>
|
<span ng-if="showAll">Show less</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/ng-template" id="addressModal.html">
|
|
||||||
<qrcode size="160" data="{{address.address}}"></qrcode>
|
|
||||||
Address: {{address.address}}<br/>
|
|
||||||
<span ng-if="$root.updatingBalance">
|
|
||||||
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
|
||||||
</span>
|
|
||||||
<span ng-if="!$root.updatingBalance">
|
|
||||||
Balance: {{address.balance || 0|noFractionNumber}} {{$root.unitName}}
|
|
||||||
</span>
|
|
||||||
<a class="close-reveal-modal" ng-click="cancel()">×</a>
|
|
||||||
</script>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
<qrcode size="160" data="{{address.address}}"></qrcode>
|
||||||
|
Address: {{address.address}}<br/>
|
||||||
|
<span ng-if="$root.updatingBalance">
|
||||||
|
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
|
||||||
|
</span>
|
||||||
|
<span ng-if="!$root.updatingBalance">
|
||||||
|
Balance: {{address.balance || 0|noFractionNumber}} {{$root.unitName}}
|
||||||
|
</span>
|
||||||
|
<a class="close-reveal-modal" ng-click="cancel()">×</a>
|
Loading…
Reference in New Issue