fix join / export\

This commit is contained in:
Matias Alejo Garcia 2015-01-03 21:04:00 -03:00
commit 1902e01267
10 changed files with 41 additions and 26 deletions

View file

@ -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;
});
});

View file

@ -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;

View file

@ -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();

View file

@ -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;
});
});

View file

@ -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;
});
});

View file

@ -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() {