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

Merge pull request #4582 from cmgustavo/bug/scrolling-proposal-desktop2

Browse source 
Fix scrolling when there are many txp s on OSX
This commit is contained in:
Gustavo Maximiliano Cortez 2016-07-13 13:01:51 -03:00 • committed by GitHub
commit fccd645f54
6 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
public/views/walletHome.html
View file

@ -34,8 +34,9 @@
-->
<ion-content id="walletHome" class="walletHome tab-view tab-in" scroll="false">
<ion-content on-release="index.allowSideBar = true; index.allowPullToRefresh = true;" on-drag-right="index.allowRefresher()" delegate-handle="my-handle">
<div id="walletHome" class="walletHome tab-view tab-in">
<ion-content on-release="index.allowSideBar = true; index.allowPullToRefresh = true;"
on-drag-right="index.allowRefresher()" delegate-handle="my-handle" overflow-scroll="true">
<ion-refresher
ng-if="index.allowPullToRefresh && index.isCordova"
on-pulling="index.allowSideBar = false"
@ -86,7 +87,7 @@
</div>
</div> <!-- oh -->
<div class="m50b">
<div class="p60b">
<div class="oh pr m20t" ng-show="index.incorrectDerivation">
<div class="text-center text-warning">
<i class="fi-alert"></i>
@ -117,12 +118,11 @@
<span>{{newRelease}}</span><i class="icon-arrow-right3 right size-18"></i>
</div>
<div class="oh pr" ng-if="index.txps[0]">
<div ng-if="index.txps[0]">
<h4 ng-show="index.requiresMultipleSignatures" class="title m0" translate>Payment Proposals</h4>
<h4 ng-show="!index.requiresMultipleSignatures" class="title m0" translate>Unsent transactions</h4>
<div ng-repeat="tx in index.txps">
<div ng-include="index.txTemplateUrl">
</div>
<div ng-include="index.txTemplateUrl"></div>
</div>
<div class="text-gray text-center size-12 p10t"
@ -239,12 +239,6 @@
</div>
</div>
<div class="text-gray text-center size-12 p10t" ng-if="index.historyShowMore">
<span class="size-12" translate>{{index.completeHistory.length - index.txHistory.length}} more</span>
&nbsp;
<i class="icon-arrow-down4"></i>
</div>
<ion-infinite-scroll
ng-if="index.historyShowMore"
on-infinite="index.showMore()"
@ -255,7 +249,7 @@
</ion-content>
<div class="extra-margin-bottom"></div>
</ion-content> <!-- END WalletHome -->
</div> <!-- END WalletHome -->
<!--