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

shows scanned data - do not disable textarea

Browse source
This commit is contained in:
Javier 2016-08-02 15:43:03 -03:00
commit 5b8b94ec19
3 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
public/views/import.html
View file

@ -50,19 +50,11 @@
<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="!dataFromQR"> <div class="qr-scanner-input-import">
<qr-scanner on-scan="processWalletInfo(data)"></qr-scanner> <qr-scanner on-scan="processWalletInfo(data)"></qr-scanner>
</div> </div>
<div class="lock-fromQR" ng-show="dataFromQR"> <textarea class="form-control m10t" name="words" ng-model="words" rows="3" autocapitalize="off" spellcheck="false"></textarea>
<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>
<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">

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

@ -62,8 +62,7 @@ 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.words = null; $scope.words = $scope.dataFromQR = info.data;
$scope.dataFromQR = info.data;
$rootScope.$apply(); $rootScope.$apply();
}, 1); }, 1);
}; };

6
src/sass/main.scss
View file

@ -895,12 +895,6 @@ ul.manage li {
background-color: #1ABC9C; background-color: #1ABC9C;
} }
.lock-fromQR {
position: absolute;
width: 100%;
margin-top: 20px;
}
.tx-proposal i { .tx-proposal i {
padding: .1rem .3rem; padding: .1rem .3rem;
background-color: #A5B2BF; background-color: #A5B2BF;