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

Merge pull request #2640 from matiu/feat/modal2

Browse source 
Feat/modal2
This commit is contained in:
Gustavo Maximiliano Cortez 2015-04-27 10:12:45 -03:00
commit 6bd35493de
9 changed files with 67 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/js/routes.js
View file

@ -30,11 +30,15 @@ angular
var orig = $delegate[level];
$delegate[level] = function() {
var args = [].slice.call(arguments);
if (!Array.isArray(args)) args = [args];
args = args.map(function(v) {
try {
if (typeof v == 'undefined') v = 'undefined';
if (typeof v == 'object') {
v = JSON.stringify(v);
if (v.message)
v = v.message;
else
v = JSON.stringify(v);
}
v = v.toString();
if (v.length > 200)
@ -48,7 +52,7 @@ angular
try {
if (window.cordova)
console.log(args.join(' '));
orig.apply(null, args)
orig.apply(null, args);
historicLog.add(level, args.join(' '));
} catch (e) {
console.log('Error at log decorator:', e);
@ -96,6 +100,7 @@ angular
templateUrl: 'views/createProfile.html',
controller: function($scope) {
$scope.mainDark = true;
$scope.noColor = true;
}
}
}
@ -120,6 +125,7 @@ angular
templateUrl: 'views/includes/topbar.html',
controller: function($scope) {
$scope.goBackToState = 'walletHome';
$scope.noColor = true;
}
}
},
@ -142,6 +148,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Join shared wallet';
$scope.goBackToState = 'add';
$scope.noColor = true;
}
}
}
@ -158,6 +165,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Import wallet';
$scope.goBackToState = 'add';
$scope.noColor = true;
}
}
}
@ -179,6 +187,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Import legacy wallet';
$scope.goBackToState = 'add';
$scope.noColor = true;
}
}
}
@ -197,6 +206,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Create new wallet';
$scope.goBackToState = 'add';
$scope.noColor = true;
}
}
}
@ -213,12 +223,6 @@ angular
}
}
})
.state('profile', {
url: '/profile',
controller: 'profileController',
templateUrl: 'views/profile.html',
needProfile: true
})
.state('preferences', {
url: '/preferences',
templateUrl: 'views/preferences.html',
@ -250,6 +254,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Language';
$scope.goBackToState = 'preferences';
$scope.noColor = true;
}
}
}
@ -268,6 +273,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Unit';
$scope.goBackToState = 'preferences';
$scope.noColor = true;
}
}
}
@ -305,6 +311,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Alternative Currency';
$scope.goBackToState = 'preferences';
$scope.noColor = true;
}
}
}
@ -323,6 +330,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Bitcore Wallet Service';
$scope.goBackToState = 'preferences';
$scope.noColor = true;
}
}
}
@ -359,6 +367,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'About';
$scope.goBackToState = 'preferences';
$scope.noColor = true;
}
}
}
@ -377,6 +386,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Logs';
$scope.goBackToState = 'about';
$scope.noColor = true;
}
}
}
@ -424,6 +434,7 @@ angular
controller: function($scope) {
$scope.titleSection = 'Add wallet';
$scope.closeToHome = true;
$scope.noColor = true;
}
}
}