shows scanned data - do not disable textarea
This commit is contained in:
parent
6d79a5da72
commit
5b8b94ec19
3 changed files with 3 additions and 18 deletions
|
|
@ -50,19 +50,11 @@
|
|||
<span translate>Type the Recovery Phrase (usually 12 words)</span>:
|
||||
</label>
|
||||
|
||||
<div class="qr-scanner-input-import" ng-show="!dataFromQR">
|
||||
<div class="qr-scanner-input-import">
|
||||
<qr-scanner on-scan="processWalletInfo(data)"></qr-scanner>
|
||||
</div>
|
||||
|
||||
<div class="lock-fromQR" ng-show="dataFromQR">
|
||||
<div class="left m10l">
|
||||
<i class="fi-lock color-greeni"></i>
|
||||
</div>
|
||||
<div class="right icon-close-import" ng-click="dataFromQR = null">
|
||||
<i class="icon-close-circle size-14"></i>
|
||||
</div>
|
||||
</div>
|
||||
<textarea class="form-control m10t" ng-disabled="dataFromQR" name="words" ng-model="words" rows="2" autocapitalize="off" spellcheck="false"></textarea>
|
||||
<textarea class="form-control m10t" name="words" ng-model="words" rows="3" autocapitalize="off" spellcheck="false"></textarea>
|
||||
|
||||
<div class="m10t oh" ng-init="hideAdv=true">
|
||||
<a class="button outline light-gray expand tiny p10i" ng-click="hideAdv=!hideAdv">
|
||||
|
|
|
|||
|
|
@ -62,8 +62,7 @@ angular.module('copayApp.controllers').controller('importController',
|
|||
$scope.testnetEnabled = info.network == 'testnet' ? true : false;
|
||||
|
||||
$timeout(function() {
|
||||
$scope.words = null;
|
||||
$scope.dataFromQR = info.data;
|
||||
$scope.words = $scope.dataFromQR = info.data;
|
||||
$rootScope.$apply();
|
||||
}, 1);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -895,12 +895,6 @@ ul.manage li {
|
|||
background-color: #1ABC9C;
|
||||
}
|
||||
|
||||
.lock-fromQR {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.tx-proposal i {
|
||||
padding: .1rem .3rem;
|
||||
background-color: #A5B2BF;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue