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

clear scope scanned data

Browse source
This commit is contained in:
Javier 2016-06-30 15:46:02 -03:00
commit 132a5a3efb
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/views/import.html
View file

@ -50,19 +50,19 @@
<span translate>Type the Recovery Phrase (usually 12 words)</span>: <span translate>Type the Recovery Phrase (usually 12 words)</span>:
</label> </label>
<div class="qr-scanner-input-import" ng-show="!fromQR"> <div class="qr-scanner-input-import" ng-show="!dataFromQR">
<qr-scanner on-scan="processWalletInfo(data)"></qr-scanner> <qr-scanner on-scan="processWalletInfo(data)"></qr-scanner>
</div> </div>
<div class="lock-fromQR"> <div class="lock-fromQR" ng-show="dataFromQR">
<div ng-show="fromQR" class="left m10l"> <div class="left m10l">
<i class="fi-lock color-greeni"></i> <i class="fi-lock color-greeni"></i>
</div> </div>
<div ng-show="fromQR" class="right icon-close-import" ng-click="fromQR = null"> <div class="right icon-close-import" ng-click="dataFromQR = null">
<i class="icon-close-circle size-14"></i> <i class="icon-close-circle size-14"></i>
</div> </div>
</div> </div>
<textarea class="form-control m10t" ng-disabled="fromQR" name="words" ng-model="words" rows="2" autocapitalize="off" spellcheck="false"></textarea> <textarea class="form-control m10t" ng-disabled="dataFromQR" name="words" ng-model="words" rows="2" autocapitalize="off" spellcheck="false"></textarea>
<div class="m10t oh" ng-init="hideAdv=true"> <div class="m10t oh" ng-init="hideAdv=true">
<a class="button outline light-gray expand tiny p10i" ng-click="hideAdv=!hideAdv"> <a class="button outline light-gray expand tiny p10i" ng-click="hideAdv=!hideAdv">

10
src/js/controllers/import.js
View file

@ -8,12 +8,11 @@ angular.module('copayApp.controllers').controller('importController',
var reader = new FileReader(); var reader = new FileReader();
var defaults = configService.getDefaults(); var defaults = configService.getDefaults();
var errors = bwcService.getErrors(); var errors = bwcService.getErrors();
var dataFromQR = null; $scope.dataFromQR = null;
$scope.bwsurl = defaults.bws.url; $scope.bwsurl = defaults.bws.url;
$scope.derivationPath = derivationPathHelper.default; $scope.derivationPath = derivationPathHelper.default;
$scope.account = 1; $scope.account = 1;
$scope.importErr = false; $scope.importErr = false;
$scope.fromQR = null;
var updateSeedSourceSelect = function() { var updateSeedSourceSelect = function() {
$scope.seedOptions = []; $scope.seedOptions = [];
@ -35,7 +34,7 @@ angular.module('copayApp.controllers').controller('importController',
}; };
$scope.processWalletInfo = function(code) { $scope.processWalletInfo = function(code) {
$scope.fromQR = null; $scope.dataFromQR = null;
$scope.importErr = false; $scope.importErr = false;
$scope.error = null; $scope.error = null;
var parsedCode = code.split('|'); var parsedCode = code.split('|');
@ -60,9 +59,8 @@ angular.module('copayApp.controllers').controller('importController',
$scope.testnetEnabled = info.network == 'testnet' ? true : false; $scope.testnetEnabled = info.network == 'testnet' ? true : false;
$timeout(function() { $timeout(function() {
$scope.fromQR = true;
$scope.words = null; $scope.words = null;
dataFromQR = info.data; $scope.dataFromQR = info.data;
$rootScope.$apply(); $rootScope.$apply();
}, 1); }, 1);
}; };
@ -251,7 +249,7 @@ angular.module('copayApp.controllers').controller('importController',
opts.networkName = pathData.networkName; opts.networkName = pathData.networkName;
opts.derivationStrategy = pathData.derivationStrategy; opts.derivationStrategy = pathData.derivationStrategy;
var words = form.words.$modelValue || dataFromQR; var words = form.words.$modelValue || $scope.dataFromQR;
$scope.error = null; $scope.error = null;
if (!words) { if (!words) {