Merge pull request #5640 from JDonadio/fix/auto-margin

Auto formating on save (no changes)
This commit is contained in:
Gabriel Edgardo Bazán 2017-02-21 10:36:02 -05:00 committed by GitHub
commit 561e23487e

View file

@ -99,33 +99,33 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
$stateProvider $stateProvider
/* /*
* *
* Other pages * Other pages
* *
*/ */
.state('unsupported', { .state('unsupported', {
url: '/unsupported', url: '/unsupported',
templateUrl: 'views/unsupported.html' templateUrl: 'views/unsupported.html'
}) })
.state('starting', { .state('starting', {
url: '/starting', url: '/starting',
template: '<ion-view id="starting"><ion-content>{{starting}}</ion-content></ion-view>', template: '<ion-view id="starting"><ion-content>{{starting}}</ion-content></ion-view>',
controller: function($scope, $log, gettextCatalog) { controller: function($scope, $log, gettextCatalog) {
$log.info('Starting...'); $log.info('Starting...');
$scope.starting = gettextCatalog.getString('Starting...'); $scope.starting = gettextCatalog.getString('Starting...');
} }
}) })
/* /*
* *
* URI * URI
* *
*/ */
.state('uri', { .state('uri', {
url: '/uri/:url', url: '/uri/:url',
controller: function($stateParams, $log, openURLService, profileService) { controller: function($stateParams, $log, openURLService, profileService) {
profileService.whenAvailable(function() { profileService.whenAvailable(function() {
@ -141,13 +141,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
templateUrl: 'views/paymentUri.html' templateUrl: 'views/paymentUri.html'
}) })
/* /*
* *
* Wallet * Wallet
* *
*/ */
.state('tabs.wallet', { .state('tabs.wallet', {
url: '/wallet/:walletId/:fromOnboarding', url: '/wallet/:walletId/:fromOnboarding',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {
@ -201,13 +201,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Tabs * Tabs
* *
*/ */
.state('tabs', { .state('tabs', {
url: '/tabs', url: '/tabs',
abstract: true, abstract: true,
controller: 'tabsController', controller: 'tabsController',
@ -267,13 +267,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Send * Send
* *
*/ */
.state('tabs.send.amount', { .state('tabs.send.amount', {
url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor', url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor',
views: { views: {
'tab-send@tabs': { 'tab-send@tabs': {
@ -304,13 +304,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Add * Add
* *
*/ */
.state('tabs.add', { .state('tabs.add', {
url: '/add', url: '/add',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {
@ -352,13 +352,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Global Settings * Global Settings
* *
*/ */
.state('tabs.notifications', { .state('tabs.notifications', {
url: '/notifications', url: '/notifications',
views: { views: {
'tab-settings@tabs': { 'tab-settings@tabs': {
@ -448,13 +448,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Wallet preferences * Wallet preferences
* *
*/ */
.state('tabs.preferences', { .state('tabs.preferences', {
url: '/preferences/:walletId', url: '/preferences/:walletId',
views: { views: {
'tab-settings@tabs': { 'tab-settings@tabs': {
@ -553,14 +553,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Addressbook * Addressbook
* *
*/ */
.state('tabs.addressbook', { .state('tabs.addressbook', {
url: '/addressbook', url: '/addressbook',
views: { views: {
'tab-settings@tabs': { 'tab-settings@tabs': {
@ -588,29 +588,29 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Copayers * Copayers
* *
*/ */
.state('tabs.copayers', { .state('tabs.copayers', {
url: '/copayers/:walletId', url: '/copayers/:walletId',
views: { views: {
'tab-home': { 'tab-home': {
templateUrl: 'views/copayers.html', templateUrl: 'views/copayers.html',
controller: 'copayersController' controller: 'copayersController'
}
} }
} })
})
/* /*
* *
* Addresses * Addresses
* *
*/ */
.state('tabs.receive.addresses', { .state('tabs.receive.addresses', {
url: '/addresses/:walletId/:toAddress', url: '/addresses/:walletId/:toAddress',
views: { views: {
'tab-receive@tabs': { 'tab-receive@tabs': {
@ -629,13 +629,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Request Specific amount * Request Specific amount
* *
*/ */
.state('tabs.receive.amount', { .state('tabs.receive.amount', {
url: '/amount/:customAmount/:toAddress', url: '/amount/:customAmount/:toAddress',
views: { views: {
'tab-receive@tabs': { 'tab-receive@tabs': {
@ -654,13 +654,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Init backup flow * Init backup flow
* *
*/ */
.state('tabs.receive.backupWarning', { .state('tabs.receive.backupWarning', {
url: '/backupWarning/:from/:walletId', url: '/backupWarning/:from/:walletId',
views: { views: {
'tab-receive@tabs': { 'tab-receive@tabs': {
@ -678,13 +678,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Paper Wallet * Paper Wallet
* *
*/ */
.state('tabs.home.paperWallet', { .state('tabs.home.paperWallet', {
url: '/paperWallet/:privateKey', url: '/paperWallet/:privateKey',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {
@ -699,7 +699,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
* *
*/ */
.state('onboarding', { .state('onboarding', {
url: '/onboarding', url: '/onboarding',
abstract: true, abstract: true,
template: '<ion-nav-view name="onboarding"></ion-nav-view>' template: '<ion-nav-view name="onboarding"></ion-nav-view>'
@ -792,13 +792,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}, },
}) })
/* /*
* *
* Feedback * Feedback
* *
*/ */
.state('tabs.feedback', { .state('tabs.feedback', {
url: '/feedback', url: '/feedback',
views: { views: {
'tab-settings@tabs': { 'tab-settings@tabs': {
@ -854,30 +854,30 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Buy or Sell Bitcoin * Buy or Sell Bitcoin
* *
*/ */
.state('tabs.buyandsell', { .state('tabs.buyandsell', {
url: '/buyandsell', url: '/buyandsell',
views: { views: {
'tab-home': { 'tab-home': {
controller: 'buyandsellController', controller: 'buyandsellController',
templateUrl: 'views/buyandsell.html' templateUrl: 'views/buyandsell.html'
}
} }
} })
})
/* /*
* *
* Glidera * Glidera
* *
* *
*/ */
.state('tabs.buyandsell.glidera', { .state('tabs.buyandsell.glidera', {
url: '/glidera/:code', url: '/glidera/:code',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {
@ -924,128 +924,128 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
} }
}) })
/* /*
* *
* Coinbase * Coinbase
* *
*/ */
.state('tabs.buyandsell.coinbase', { .state('tabs.buyandsell.coinbase', {
url: '/coinbase/:code', url: '/coinbase/:code',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {
controller: 'coinbaseController', controller: 'coinbaseController',
controllerAs: 'coinbase', controllerAs: 'coinbase',
templateUrl: 'views/coinbase.html' templateUrl: 'views/coinbase.html'
}
} }
} })
}) .state('tabs.preferences.coinbase', {
.state('tabs.preferences.coinbase', { url: '/coinbase',
url: '/coinbase', views: {
views: { 'tab-settings@tabs': {
'tab-settings@tabs': { controller: 'preferencesCoinbaseController',
controller: 'preferencesCoinbaseController', templateUrl: 'views/preferencesCoinbase.html'
templateUrl: 'views/preferencesCoinbase.html' }
} }
} })
}) .state('tabs.buyandsell.coinbase.amount', {
.state('tabs.buyandsell.coinbase.amount', { url: '/amount/:nextStep/:currency',
url: '/amount/:nextStep/:currency', views: {
views: { 'tab-home@tabs': {
'tab-home@tabs': { controller: 'amountController',
controller: 'amountController', templateUrl: 'views/amount.html'
templateUrl: 'views/amount.html' }
} }
} })
}) .state('tabs.buyandsell.coinbase.buy', {
.state('tabs.buyandsell.coinbase.buy', { url: '/buy/:amount/:currency',
url: '/buy/:amount/:currency', views: {
views: { 'tab-home@tabs': {
'tab-home@tabs': { controller: 'buyCoinbaseController',
controller: 'buyCoinbaseController', templateUrl: 'views/buyCoinbase.html'
templateUrl: 'views/buyCoinbase.html' }
} }
} })
}) .state('tabs.buyandsell.coinbase.sell', {
.state('tabs.buyandsell.coinbase.sell', { url: '/sell/:amount/:currency',
url: '/sell/:amount/:currency', views: {
views: { 'tab-home@tabs': {
'tab-home@tabs': { controller: 'sellCoinbaseController',
controller: 'sellCoinbaseController', templateUrl: 'views/sellCoinbase.html'
templateUrl: 'views/sellCoinbase.html' }
} }
} })
})
/* /*
* *
* Gift Cards * Gift Cards
* *
*/ */
.state('tabs.giftcards', { .state('tabs.giftcards', {
url: '/giftcards', url: '/giftcards',
abstract: true abstract: true
}) })
/* /*
* *
* Amazon.com Gift Card * Amazon.com Gift Card
* *
*/ */
.state('tabs.giftcards.amazon', { .state('tabs.giftcards.amazon', {
url: '/amazon', url: '/amazon',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {
controller: 'amazonController', controller: 'amazonController',
templateUrl: 'views/amazon.html' templateUrl: 'views/amazon.html'
}
} }
} })
}) .state('tabs.giftcards.amazon.cards', {
.state('tabs.giftcards.amazon.cards', { url: '/cards',
url: '/cards', views: {
views: { 'tab-home@tabs': {
'tab-home@tabs': { controller: 'amazonCardsController',
controller: 'amazonCardsController', templateUrl: 'views/amazonCards.html'
templateUrl: 'views/amazonCards.html' }
},
params: {
cardClaimCode: null
} }
}, })
params: { .state('tabs.giftcards.amazon.amount', {
cardClaimCode: null url: '/amount',
} views: {
}) 'tab-home@tabs': {
.state('tabs.giftcards.amazon.amount', { controller: 'amountController',
url: '/amount', templateUrl: 'views/amount.html'
views: { }
'tab-home@tabs': { },
controller: 'amountController', params: {
templateUrl: 'views/amount.html' nextStep: 'tabs.giftcards.amazon.buy',
currency: 'USD',
forceCurrency: true
} }
}, })
params: { .state('tabs.giftcards.amazon.buy', {
nextStep: 'tabs.giftcards.amazon.buy', url: '/buy/:amount/:currency',
currency: 'USD', views: {
forceCurrency: true 'tab-home@tabs': {
} controller: 'buyAmazonController',
}) templateUrl: 'views/buyAmazon.html'
.state('tabs.giftcards.amazon.buy', { }
url: '/buy/:amount/:currency',
views: {
'tab-home@tabs': {
controller: 'buyAmazonController',
templateUrl: 'views/buyAmazon.html'
} }
} })
})
/* /*
* *
* BitPay Card * BitPay Card
* *
*/ */
.state('tabs.bitpayCardIntro', { .state('tabs.bitpayCardIntro', {
url: '/bitpay-card-intro/:secret/:email/:otp', url: '/bitpay-card-intro/:secret/:email/:otp',
views: { views: {
'tab-home@tabs': { 'tab-home@tabs': {