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

Fix scrolling on iOS

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-07-14 18:55:46 -03:00
commit c19f0ea70c
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
public/index.html
View file

@ -1,4 +1,4 @@
<!doctype html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
@ -19,13 +19,13 @@
<ion-side-menus class="page" ng-controller="indexController as index">
<!-- Left menu -->
<ion-side-menu side="left" expose-aside-when="large" ng-if="isDisclaimerAccepted">
<div ng-include="'views/includes/sidebar.html'" ng-if="index.hasProfile"></div>
<ion-side-menu side="left" expose-aside-when="large" ng-if="index.hasProfile && isDisclaimerAccepted">
<div ng-include="'views/includes/sidebar.html'"></div>
</ion-side-menu>
<!-- Main content -->
<ion-side-menu-content drag-content="index.isCordova && index.allowSideBar">
<ion-side-menu-content drag-content="index.isCordova">
<div notifications="right top"></div>
<div id="sectionContainer">
<div id="mainSection">

4
public/views/includes/sidebar.html
View file

@ -23,14 +23,14 @@
</div>
<div translate>Create, join or import</div>
</li>
<li ng-show="!index.isWindowsPhoneApp && (index.glideraEnabled || index.coinbaseEnabled)" menu-toggle href ui-sref="buyandsell">
<li ng-show="!index.noFocusedWallet && !index.isWindowsPhoneApp && (index.glideraEnabled || index.coinbaseEnabled)" menu-toggle href ui-sref="buyandsell">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="icon-bank size-24 icon vm"></i>
<div class="tu text-bold m5t">
<span class="size-12" translate>Buy and Sell</span>
</div>
</li>
<li menu-toggle href ui-sref="preferencesGlobal">
<li ng-show="!index.noFocusedWallet" menu-toggle href ui-sref="preferencesGlobal">
<i class="icon-arrow-right3 size-18 right m10t vm"></i>
<i class="fi-widget size-24 icon vm"></i>
<div class="tu text-bold">

7
src/js/controllers/index.js
View file

@ -70,12 +70,7 @@ angular.module('copayApp.controllers').controller('indexController', function($r
};
self.allowRefresher = function() {
if ($ionicSideMenuDelegate.getOpenRatio() != 0) {
self.allowPullToRefresh = false;
if (isCordova && platformInfo.isIOS) $ionicScrollDelegate.$getByHandle('my-handle').freezeScroll(true);
return;
}
if (isCordova && platformInfo.isIOS) $ionicScrollDelegate.$getByHandle('my-handle').freezeScroll(false);
if ($ionicSideMenuDelegate.getOpenRatio() != 0) self.allowPullToRefresh = false;
}
self.hideBalance = function() {