fix join / export\
This commit is contained in:
Matias Alejo Garcia
parent
38495f11b7
commit
1902e01267
10 changed files with 41 additions and 26 deletions
6
Makefile
6
Makefile
|
|
@ -24,8 +24,8 @@ release-android: cordova-base
|
|||
make -C cordova release-android
|
||||
|
||||
wp8:
|
||||
cordova/build.sh WP8
|
||||
cordova/wp/fix-svg.sh
|
||||
echo -e "\a"
|
||||
cordova/build.sh WP8
|
||||
cordova/wp/fix-svg.sh
|
||||
echo -e "\a"
|
||||
|
||||
|
||||
|
|
|
|||
16
index.html
16
index.html
|
|
@ -1,4 +1,4 @@
|
|||
<!doctype html>
|
||||
<!doctype html>
|
||||
<html lang="en" ng-app="copayApp" ng-csp>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
|
|
@ -83,14 +83,14 @@
|
|||
<a class="left-off-canvas-toggle menu-icon" ><span></span></a>
|
||||
</section>
|
||||
|
||||
<section class="right-small" ng-show="$root.iden && $root.wallet.isComplete()">
|
||||
<a class="p10" ng-click="$root.go('more')"><i class="fi-widget size-24"></i></a>
|
||||
</section>
|
||||
<section class="right-small" ng-show="$root.iden && $root.wallet.isComplete() && !$root.hideWalletNavigation">
|
||||
<a class="p10" ng-click="$root.go('more')"><i class="fi-widget size-24"></i></a>
|
||||
</section>
|
||||
|
||||
<section class="middle tab-bar-section">
|
||||
<h1 class="title ellipsis" ng-show="$root.iden && $root.wallet">
|
||||
{{$root.wallet.getName()}}
|
||||
</h1>
|
||||
<h1 class="title ellipsis" ng-show="$root.iden && $root.wallet && !$root.hideWalletNavigation">
|
||||
{{$root.wallet.getName()}}
|
||||
</h1>
|
||||
</section>
|
||||
</nav>
|
||||
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
role='navigation'
|
||||
class="sidebar"></div>
|
||||
<div class="bottom-bar" ng-if="$root.wallet &&
|
||||
$root.wallet.isComplete() && !$root.wallet.isLocked">
|
||||
$root.wallet.isComplete() && !$root.wallet.isLocked && !$root.hideWalletNavigation">
|
||||
<div ng-include="'views/includes/bottombar-mobile.html'"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,15 +1,17 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('copayApp.controllers').controller('CreateController',
|
||||
function($scope, $rootScope, $location, $timeout, identityService, backupService, notification, defaults) {
|
||||
function($scope, $rootScope, $location, $timeout, identityService, backupService, notification, defaults, isMobile, isCordova) {
|
||||
|
||||
$rootScope.fromSetup = true;
|
||||
$scope.loading = false;
|
||||
$scope.walletPassword = $rootScope.walletPassword;
|
||||
$scope.isMobile = !!window.cordova;
|
||||
$scope.isMobile = isMobile.any();
|
||||
$scope.hideAdv = true;
|
||||
$scope.networkName = config.networkName;
|
||||
$rootScope.title = 'Create new wallet';
|
||||
$rootScope.hideWalletNavigation = true;
|
||||
$scope.isWindowsPhoneApp = isMobile.Windows() && isCordova;
|
||||
|
||||
// ng-repeat defined number of times instead of repeating over array?
|
||||
$scope.getNumber = function(num) {
|
||||
|
|
@ -39,6 +41,7 @@ angular.module('copayApp.controllers').controller('CreateController',
|
|||
return $scope.networkUrl != defaults.network.livenet.url && $scope.networkUrl != defaults.network.testnet.url;
|
||||
};
|
||||
|
||||
|
||||
$scope.create = function(form) {
|
||||
if (form && form.$invalid) {
|
||||
$scope.error = 'Please enter the required fields';
|
||||
|
|
@ -68,4 +71,8 @@ angular.module('copayApp.controllers').controller('CreateController',
|
|||
},1);
|
||||
});
|
||||
};
|
||||
|
||||
$scope.$on("$destroy", function () {
|
||||
$rootScope.hideWalletNavigation = false;
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
|
|||
$scope.minPasswordStrength = _.isUndefined(config.minPasswordStrength) ?
|
||||
4 : config.minPasswordStrength;
|
||||
|
||||
//TODO
|
||||
$scope.minPasswordStrength = 1;
|
||||
|
||||
pinService.makePinInput($scope, 'newpin', function(newValue) {
|
||||
_firstpin = newValue;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
|
||||
angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService) {
|
||||
$scope.initHome = function() {
|
||||
$rootScope.title = 'Home';
|
||||
$rootScope.title = 'Home';
|
||||
$rootScope.hideWalletNavigation = false;
|
||||
|
||||
var w = $rootScope.wallet;
|
||||
$scope.isShared = w.isShared();
|
||||
$scope.requiresMultipleSignatures = w.requiresMultipleSignatures();
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ angular.module('copayApp.controllers').controller('ImportController',
|
|||
$scope.isSafari = isMobile.Safari();
|
||||
$scope.isCordova = isCordova;
|
||||
$scope.importOpts = {};
|
||||
$rootScope.hideWalletNavigation = true;
|
||||
|
||||
|
||||
window.ignoreMobilePause = true;
|
||||
$scope.$on('$destroy', function() {
|
||||
|
|
@ -96,4 +98,10 @@ angular.module('copayApp.controllers').controller('ImportController',
|
|||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
$scope.$on("$destroy", function () {
|
||||
$rootScope.hideWalletNavigation = false;
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@ angular.module('copayApp.controllers').controller('JoinController',
|
|||
$scope.loading = false;
|
||||
$scope.isMobile = isMobile.any();
|
||||
$rootScope.title = 'Join shared wallet';
|
||||
$rootScope.hideWalletNavigation = true;
|
||||
|
||||
|
||||
// QR code Scanner
|
||||
var cameraInput;
|
||||
|
|
@ -150,4 +152,9 @@ angular.module('copayApp.controllers').controller('JoinController',
|
|||
$timeout(function () { $scope.$digest(); }, 1);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
$scope.$on("$destroy", function () {
|
||||
$rootScope.hideWalletNavigation = false;
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@ angular.module('copayApp.controllers').controller('SendController',
|
|||
|
||||
$scope.isMobile = isMobile.any();
|
||||
$scope.isWindowsPhoneApp = isMobile.Windows() && isCordova;
|
||||
|
||||
// TODO
|
||||
$scope.isWindowsPhoneApp = 1;
|
||||
$rootScope.wpInputFocused = false;
|
||||
|
||||
$scope.isShared = w.isShared();
|
||||
|
|
@ -73,7 +70,7 @@ angular.module('copayApp.controllers').controller('SendController',
|
|||
}
|
||||
$timeout(function() {
|
||||
$rootScope.$digest();
|
||||
}, 100);
|
||||
}, 1);
|
||||
};
|
||||
|
||||
$scope.setInputs = function() {
|
||||
|
|
|
|||
|
|
@ -3,11 +3,6 @@
|
|||
<div ng-include="'views/includes/loading.html'" ng-init="title = 'Creating wallet'"></div>
|
||||
</div>
|
||||
<div class="setup" ng-show="!loading && !$root.starting">
|
||||
<div class="row hide-for-large-up">
|
||||
<div class="medium-12 small-12 columns">
|
||||
<h1>{{$root.title}}</h1>
|
||||
</div>
|
||||
</div>
|
||||
<form name="setupForm" ng-submit="create(setupForm)" novalidate>
|
||||
<div class="row">
|
||||
<div class="large-12 columns">
|
||||
|
|
@ -24,7 +19,7 @@
|
|||
<div class="panel">
|
||||
<label><span translate>Wallet name</span>
|
||||
<div class="input">
|
||||
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" ng-required="true">
|
||||
<input type="text" placeholder="{{'Family vacation funds'|translate}}" class="form-control" ng-model="walletName" ng-required="true">
|
||||
</div>
|
||||
</label>
|
||||
<div class="row">
|
||||
|
|
|
|||
|
|
@ -149,6 +149,7 @@
|
|||
<form ng-show="createStep == 'pass'" name="passForm" ng-submit="createProfile(passForm)" novalidate>
|
||||
|
||||
<div class="box-notification" ng-show="passwordStrength">
|
||||
<!-- if you change this, check it on WP...-->
|
||||
<div class="box-icon" ng-if="passwordStrength.strength< minPasswordStrength" style="background-color:#dd514c">
|
||||
<i class="fi-x size-24"></i>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue