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

Merge pull request #2650 from matiaspando/fix/sendFlick2

Browse source 
Avoid flickering on Send form
This commit is contained in:
Matias Alejo Garcia 2015-04-28 12:14:18 -03:00
commit 8a31e523f5
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
public/views/walletHome.html
View file

@ -307,33 +307,34 @@
</div> </div>
</div> </div>
<div class="row" ng-init="showAlternative = false" ng-hide="home.hideAmount"> <div class="row" ng-init="home.hideAlternative()" ng-hide="home.hideAmount">
<div class="large-12 medium-12 columns"> <div class="large-12 medium-12 columns">
<div class="m5b right" ng-hide="sendForm.amount.$pristine"> <div class="right" ng-hide="sendForm.amount.$pristine && !sendForm.amount.$modelValue ">
<span class="has-error right size-12" ng-show="sendForm.amount.$invalid"> <span class="has-error right size-12" ng-if="sendForm.amount.$invalid">
<span class="icon-input"><i class="fi-x"></i></span> <span class="icon-input"><i class="fi-x"></i></span>
<span translate>Not valid</span> <span translate>Not valid</span>
</span> </span>
<small class="icon-input right" ng-show="!sendForm.amount.$invalid"> <small class="icon-input right" ng-if="!sendForm.amount.$invalid">
<i class="fi-check"></i> <i class="fi-check"></i>
</small> </small>
</div> </div>
<div ng-show="!showAlternative"> <div ng-if="!home.canShowAlternative()">
<label for="amount"> <label for="amount">
<span translate>Amount</span> <span translate>Amount</span>
</label> </label>
<div class="input"> <div class="input">
<input type="number" id="amount" ng-disabled="home.blockUx || home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off" ng-focus="home.formFocus('amount')" ng-blur="home.formFocus(false)"> <input type="number" id="amount" ng-disabled="home.blockUx || home.lockAmount" name="amount" ng-attr-placeholder="{{'Amount'|translate}}" ng-minlength="0.00000001" ng-maxlength="10000000000" ng-model="_amount" valid-amount required autocomplete="off" ng-focus="home.formFocus('amount')" ng-blur="home.formFocus(false)">
<a class="postfix" ng-click="showAlternative = true">{{home.unitName}}</a> <input type="number" id="alternative" name="alternative" ng-model="_alternative" style="display:none">
<a class="postfix" ng-click="home.showAlternative()">{{home.unitName}}</a>
</div> </div>
</div> </div>
<div ng-show="showAlternative"> <div ng-if="home.canShowAlternative()">
<label for="alternative"><span translate>Amount in</span> {{ home.alternativeName }} <label for="alternative"><span translate>Amount in</span> {{ home.alternativeName }}
</label> </label>
<div class="input"> <div class="input">
<input type="number" id="alternative" ng-disabled="home.blockUx || !home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount'|translate}}" ng-model="_alternative" requiredautocomplete="off" ng-focus="home.formFocus('amount')" ng-blur="home.formFocus(false)"> <input type="number" id="alternative" ng-disabled="home.blockUx || !home.isRateAvailable || home.lockAmount" name="alternative" ng-attr-placeholder="{{'Amount'|translate}}" ng-model="_alternative" requiredautocomplete="off" ng-focus="home.formFocus('amount')" ng-blur="home.formFocus(false)">
<a class="postfix" ng-click="showAlternative = false"> {{ home.alternativeIsoCode }}</a> <input type="number" id="amount" name="amount" ng-model="_amount" style="display:none">
<a class="postfix" ng-click="home.hideAlternative()"> {{ home.alternativeIsoCode }}</a>
</div> </div>
</div> </div>
</div> </div>

13
src/js/controllers/walletHome.js
View file

@ -328,6 +328,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
}; };
// Send // Send
this.canShowAlternative = function() {
return $scope.showAlternative;
};
this.showAlternative = function() {
$scope.showAlternative = true;
};
this.hideAlternative = function() {
$scope.showAlternative = false;
};
this.resetError = function() { this.resetError = function() {
this.error = this.success = null; this.error = this.success = null;
}; };