Fixes loading message after press a button

This commit is contained in:
Gustavo Maximiliano Cortez 2015-02-13 13:05:56 -03:00
parent 8b2305a778
commit 112c1adc11
7 changed files with 42 additions and 35 deletions

View File

@ -127,7 +127,9 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
return; return;
} }
$scope.open(form.email.$modelValue, form.password.$modelValue); $timeout(function() {
$scope.open(form.email.$modelValue, form.password.$modelValue);
}, 100);
}; };
@ -165,7 +167,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
} else { } else {
$scope.error = 'Unknown error'; $scope.error = 'Unknown error';
} }
$rootScope.starting = false;
$timeout(function() { $timeout(function() {
$rootScope.$digest(); $rootScope.$digest();
}, 1) }, 1)

View File

@ -70,33 +70,36 @@ angular.module('copayApp.controllers').controller('ImportController',
$rootScope.starting = true; $rootScope.starting = true;
$scope.importOpts = {}; $timeout(function() {
var skipFields = []; $scope.importOpts = {};
if ($scope.skipPublicKeyRing) var skipFields = [];
skipFields.push('publicKeyRing');
if ($scope.skipTxProposals) if ($scope.skipPublicKeyRing)
skipFields.push('txProposals'); skipFields.push('publicKeyRing');
if (skipFields) if ($scope.skipTxProposals)
$scope.importOpts.skipFields = skipFields; skipFields.push('txProposals');
if (backupFile) { if (skipFields)
reader.readAsBinaryString(backupFile); $scope.importOpts.skipFields = skipFields;
} else {
updateStatus('Importing wallet - Procesing backup...'); if (backupFile) {
identityService.importWallet(backupText, $scope.password, $scope.importOpts, function(err) { reader.readAsBinaryString(backupFile);
if (err) { } else {
$rootScope.starting = false; updateStatus('Importing wallet - Procesing backup...');
$scope.error = 'Could not read wallet. Please check your password'; identityService.importWallet(backupText, $scope.password, $scope.importOpts, function(err) {
$timeout(function() { if (err) {
$rootScope.$digest(); $rootScope.starting = false;
}, 1); $scope.error = 'Could not read wallet. Please check your password';
} $timeout(function() {
}); $rootScope.$digest();
} }, 1);
}
});
}
}, 100);
}; };

View File

@ -70,10 +70,13 @@ angular.module('copayApp.controllers').controller('ImportProfileController',
$rootScope.starting = true; $rootScope.starting = true;
if (backupFile) { $timeout(function() {
reader.readAsBinaryString(backupFile);
} else { if (backupFile) {
_importBackup(backupText); reader.readAsBinaryString(backupFile);
} } else {
_importBackup(backupText);
}
}, 100);
}; };
}); });

View File

@ -185,7 +185,7 @@ angular.module('copayApp.controllers').controller('SendController',
$scope.loading = true; $scope.loading = true;
$scope.creatingTX = true; $scope.creatingTX = true;
if ($scope.isWindowsPhoneApp) if ($scope.isWindowsPhoneApp)
$rootScope.wpInputFocused = true; $rootScope.wpInputFocused = true;
$timeout(function () { $timeout(function () {
var comment = form.comment.$modelValue; var comment = form.comment.$modelValue;
@ -212,7 +212,7 @@ angular.module('copayApp.controllers').controller('SendController',
txStatus.notify(status); txStatus.notify(status);
$scope.resetForm(); $scope.resetForm();
}); });
}, 1); }, 100);
}; };
// QR code Scanner // QR code Scanner

View File

@ -121,9 +121,9 @@
<button translate type="submit" class="button primary radius expand m0" ng-disabled="loginForm.$invalid"> <button translate type="submit" class="button primary radius expand m0"
ng-disabled="loginForm.$invalid">
Sign in Sign in
{{hideAll}}
</button> </button>
</form> </form>
<div ng-if="usingLocalStorage" class="text-gray size-12 m10v"> <div ng-if="usingLocalStorage" class="text-gray size-12 m10v">

View File

@ -86,7 +86,7 @@
<div class="text-right m20t"> <div class="text-right m20t">
<button translate type="submit" class="button expand black m0" <button translate type="submit" class="button expand black m0"
ng-disabled="importForm.$invalid || $root.starting"> ng-disabled="importForm.$invalid">
Import backup Import backup
</button> </button>
</div> </div>

View File

@ -47,7 +47,7 @@
<button translate type="submit" <button translate type="submit"
class="button primary radius expand m0" class="button primary radius expand m0"
ng-disabled="importProfileForm.$invalid || $root.starting"> ng-disabled="importProfileForm.$invalid">
Import backup Import backup
</button> </button>
</form> </form>